diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2016-11-01 10:29:29 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2016-11-01 13:31:02 +0200 |
| commit | 746dedd0692115e85edce087178d57893632fd16 (patch) | |
| tree | 7fc50cca5e20fbfcacf2f60354146cfe921ca794 /main/musl/0022-fix-gratuitous-undefined-behavior-in-strptime.patch | |
| parent | 7171b9d299ed161ae8d0065ac7adc4cc8dadfd39 (diff) | |
| download | aports-746dedd0692115e85edce087178d57893632fd16.tar.bz2 aports-746dedd0692115e85edce087178d57893632fd16.tar.xz | |
main/musl: cherry-pick various upstream fixes, add pthread_set_attr_default_np
Diffstat (limited to 'main/musl/0022-fix-gratuitous-undefined-behavior-in-strptime.patch')
| -rw-r--r-- | main/musl/0022-fix-gratuitous-undefined-behavior-in-strptime.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/main/musl/0022-fix-gratuitous-undefined-behavior-in-strptime.patch b/main/musl/0022-fix-gratuitous-undefined-behavior-in-strptime.patch new file mode 100644 index 0000000000..6da625dd76 --- /dev/null +++ b/main/musl/0022-fix-gratuitous-undefined-behavior-in-strptime.patch @@ -0,0 +1,34 @@ +From f33b17585058381491e6fda08f491b8e48c7980c Mon Sep 17 00:00:00 2001 +From: Rich Felker <dalias@aerifal.cx> +Date: Thu, 20 Oct 2016 13:22:20 -0400 +Subject: [PATCH 22/25] fix gratuitous undefined behavior in strptime + +accessing an object of type const char *restrict as if it had type +char * is not defined. +--- + src/time/strptime.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/time/strptime.c b/src/time/strptime.c +index f41f55f..55c7ed1 100644 +--- a/src/time/strptime.c ++++ b/src/time/strptime.c +@@ -22,8 +22,13 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri + } + f++; + if (*f == '+') f++; +- if (isdigit(*f)) w=strtoul(f, (void *)&f, 10); +- else w=-1; ++ if (isdigit(*f)) { ++ char *new_f; ++ w=strtoul(f, &new_f, 10); ++ f = new_f; ++ } else { ++ w=-1; ++ } + adj=0; + switch (*f++) { + case 'a': case 'A': +-- +2.10.1 + |