diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-03-20 15:25:48 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-03-21 08:15:29 +0200 |
| commit | 1a4d299a0242a02aa0d4843dd9947d4187e70414 (patch) | |
| tree | 524965445ca8c9eba7f425db6ffb2035d8025500 /main/musl/0022-fix-wide-scanf-s-use-of-a-compound-literal-past-its-.patch | |
| parent | c12931e8863fa9fddc90390db24a4a591f43043e (diff) | |
| download | aports-1a4d299a0242a02aa0d4843dd9947d4187e70414.tar.bz2 aports-1a4d299a0242a02aa0d4843dd9947d4187e70414.tar.xz | |
main/musl: cherry-pick upstream fixes
ldso changes (lazy emulation etc) are not stable yet, so it's
are not included. the missing patch numbers are for those commits.
Diffstat (limited to 'main/musl/0022-fix-wide-scanf-s-use-of-a-compound-literal-past-its-.patch')
| -rw-r--r-- | main/musl/0022-fix-wide-scanf-s-use-of-a-compound-literal-past-its-.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/main/musl/0022-fix-wide-scanf-s-use-of-a-compound-literal-past-its-.patch b/main/musl/0022-fix-wide-scanf-s-use-of-a-compound-literal-past-its-.patch new file mode 100644 index 0000000000..4e0c165fb6 --- /dev/null +++ b/main/musl/0022-fix-wide-scanf-s-use-of-a-compound-literal-past-its-.patch @@ -0,0 +1,30 @@ +From 733d1ea759119bcd0554f25034d1b4113b910900 Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Tue, 14 Mar 2017 15:06:58 -0400 +Subject: [PATCH] fix wide scanf's use of a compound literal past its lifetime + +--- + src/stdio/vfwscanf.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/stdio/vfwscanf.c b/src/stdio/vfwscanf.c +index 223aad4f..1ebc5cef 100644 +--- a/src/stdio/vfwscanf.c ++++ b/src/stdio/vfwscanf.c +@@ -214,11 +214,12 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap) + set = L""; + } else if (t == 's') { + invert = 1; +- set = (const wchar_t[]){ ++ static const wchar_t spaces[] = { + ' ', '\t', '\n', '\r', 11, 12, 0x0085, + 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, + 0x2006, 0x2008, 0x2009, 0x200a, + 0x2028, 0x2029, 0x205f, 0x3000, 0 }; ++ set = spaces; + } else { + if (*++p == '^') p++, invert = 1; + else invert = 0; +-- +2.11.1 + |