fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-05-30 08:01:38 +00:00
Code Issues Projects Releases Wiki Activity

fix strptime output for %C without %y

Browse Source 
in this case, a potentially-uninitialized or unrelated existing value
in tm_year was being used. instead use 0 if %y was not present.
This commit is contained in:
Julien Ramseier 2017-03-21 12:35:16 -04:00 committed by Rich Felker
parent 834ef7aff5
commit b6e1fe0d5e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/time/strptime.c
View File

@ -11,7 +11,7 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri
int i, w, neg, adj, min, range, *dest, dummy; int i, w, neg, adj, min, range, *dest, dummy;
const char *ex; const char *ex;
size_t len; size_t len;
int want_century = 0, century = 0; int want_century = 0, century = 0, relyear = 0;
while (*f) { while (*f) {
if (*f != '%') { if (*f != '%') {
if (isspace(*f)) for (; *s && isspace(*s); s++); if (isspace(*f)) for (; *s && isspace(*s); s++);
@ -144,7 +144,7 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri
if (!s) return 0; if (!s) return 0;
break; break;
case 'y': case 'y':
dest = &tm->tm_year; dest = &relyear;
w = 2; w = 2;
want_century |= 1; want_century |= 1;
goto numeric_digits; goto numeric_digits;
@ -198,6 +198,7 @@ char *strptime(const char *restrict s, const char *restrict f, struct tm *restri
} }
} }
if (want_century) { if (want_century) {
tm->tm_year = relyear;
if (want_century & 2) tm->tm_year += century * 100 - 1900; if (want_century & 2) tm->tm_year += century * 100 - 1900;
else if (tm->tm_year <= 68) tm->tm_year += 100; else if (tm->tm_year <= 68) tm->tm_year += 100;
} }