From: Ulrich Drepper <drepper@redhat.com>
Date: Tue, 29 Jan 2002 19:07:59 +0000 (+0000)
Subject: (__mempcpy): Protect size arg for addition when using __builtin_memcpy.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bf689a66460b357984cd91fe3b191e92acdc11be;p=thirdparty%2Fglibc.git

(__mempcpy): Protect size arg for addition when using __builtin_memcpy.
---

diff --git a/string/bits/string2.h b/string/bits/string2.h
index 6c56c63cc12..da168facc28 100644
--- 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) \