]> granicus.if.org Git - musl/commitdiff
fix undefined behavior in memset due to missing sequence points
authorRich Felker <dalias@aerifal.cx>
Tue, 29 Aug 2017 23:53:50 +0000 (19:53 -0400)
committerRich Felker <dalias@aerifal.cx>
Tue, 29 Aug 2017 23:53:50 +0000 (19:53 -0400)
patch by Pascal Cuoq.

src/string/memset.c

index f438b073ae099d69556a7ddb6a838973cb4b13d9..5613a1486e6a6fc3988be6561f41b07b2647d80f 100644 (file)
@@ -11,12 +11,16 @@ void *memset(void *dest, int c, size_t n)
         * offsets are well-defined and in the dest region. */
 
        if (!n) return dest;
-       s[0] = s[n-1] = c;
+       s[0] = c;
+       s[n-1] = c;
        if (n <= 2) return dest;
-       s[1] = s[n-2] = c;
-       s[2] = s[n-3] = c;
+       s[1] = c;
+       s[2] = c;
+       s[n-2] = c;
+       s[n-3] = c;
        if (n <= 6) return dest;
-       s[3] = s[n-4] = c;
+       s[3] = c;
+       s[n-4] = c;
        if (n <= 8) return dest;
 
        /* Advance pointer to align it at a 4-byte boundary,