From afdba0ba0b8c0e92c376e7f1bfb151c07bf654b6 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 12 Oct 2017 00:51:20 +0000 Subject: main/musl: update to alpine version 1.1.16-r21 - incorporate unreleased upstream bugfixes from august to present: - fix OOB reads in memmem implementations - fix undefined behaviour in memset - fix memory leak in clearenv - fix unicode processing bugs - fix signal masking issue with pthread_create - fix glob descent with GLOB_PERIOD - implement fopencookie(3) --- ...ed-behavior-in-memset-due-to-missing-sequ.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 main/musl/0063-fix-undefined-behavior-in-memset-due-to-missing-sequ.patch (limited to 'main/musl/0063-fix-undefined-behavior-in-memset-due-to-missing-sequ.patch') diff --git a/main/musl/0063-fix-undefined-behavior-in-memset-due-to-missing-sequ.patch b/main/musl/0063-fix-undefined-behavior-in-memset-due-to-missing-sequ.patch new file mode 100644 index 0000000000..e247b7f404 --- /dev/null +++ b/main/musl/0063-fix-undefined-behavior-in-memset-due-to-missing-sequ.patch @@ -0,0 +1,39 @@ +From 9d4c902c42b3fda368d7ea64bb9575c46228fa7f Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Tue, 29 Aug 2017 19:53:50 -0400 +Subject: [PATCH 11/30] fix undefined behavior in memset due to missing + sequence points + +patch by Pascal Cuoq. +--- + src/string/memset.c | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/string/memset.c b/src/string/memset.c +index f438b073..5613a148 100644 +--- a/src/string/memset.c ++++ b/src/string/memset.c +@@ -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, +-- +2.13.3 + -- cgit v1.2.3