Update.

2002-01-29  Ben Collins  <bcollins@debian.org>

	* string/bits/string2.h (__mempcpy): Protect size arg for
	addition when using __builtin_memcpy.

diff --git a/ChangeLog b/ChangeLog
index 83c5ece9322895d004d8e7c2ec70a2ef33f9536d..ea804c3ea462746b71b4aa3d9a2ad19bfb000a6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-01-29  Ben Collins  <bcollins@debian.org>
+
+       * string/bits/string2.h (__mempcpy): Protect size arg for
+       addition when using __builtin_memcpy.
+
 2002-01-29  Ulrich Drepper  <drepper@redhat.com>
 
        * stdlib/Makefile (tests): Add tst-qsort.

diff --git a/string/bits/string2.h b/string/bits/string2.h
index 6c56c63cc12c1fe4a85cf6382b79510749f98c33..da168facc28ebe8a04fac30ea0b481e1f65c407b 100644 (file)
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -202,7 +202,7 @@ __STRING2_COPY_TYPE (8);
 #    define __mempcpy(dest, src, n) \
   (__extension__ (__builtin_constant_p (src) && __builtin_constant_p (n)      \
                  && __string2_1bptr_p (src) && n <= 8                        \
-                 ? __builtin_memcpy (dest, src, n) + n                       \
+                 ? __builtin_memcpy (dest, src, n) + (n)                     \
                  : __mempcpy (dest, src, n)))
 #   else
 #    define __mempcpy(dest, src, n) \