diff options
| -rw-r--r-- | newlib/ChangeLog | 5 | ||||
| -rw-r--r-- | newlib/libc/string/memset.c | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 9cc8bfec4..10d5f903b 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2002-11-25 Kazu Hirata <kazu@cs.umass.edu> + + * libc/string/memset.c (memset): Make it safe even if + sizeof (int) = 2. + 2002-11-22 Joe Buehler <jbuehler@hekimian.com> * configure.in: Change check for libc/include in ${CC} to diff --git a/newlib/libc/string/memset.c b/newlib/libc/string/memset.c index a5890c884..eceff8e9c 100644 --- a/newlib/libc/string/memset.c +++ b/newlib/libc/string/memset.c @@ -64,21 +64,23 @@ _DEFUN (memset, (m, c, n), { /* If we get this far, we know that n is large and m is word-aligned. */ + /* To avoid sign extention, copy C to an unsigned variable. */ + unsigned int d = c & 0xff; + aligned_addr = (unsigned long*)m; - /* Store C into each char sized location in BUFFER so that + /* Store D into each char sized location in BUFFER so that we can set large blocks quickly. */ - c &= 0xff; if (LBLOCKSIZE == 4) { - buffer = (c << 8) | c; + buffer = (d << 8) | d; buffer |= (buffer << 16); } else { buffer = 0; for (i = 0; i < LBLOCKSIZE; i++) - buffer = (buffer << 8) | c; + buffer = (buffer << 8) | d; } while (n >= LBLOCKSIZE*4) |