fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-07-03 16:41:59 +00:00
Code Issues Projects Releases Wiki Activity

fix failure to distinguish input/match failure in wide %[ scanf

Browse Source 
this also includes a related fix for vswscanf's read function, which
was returning a spurious (uninitialized) character for empty strings.
This commit is contained in:
Rich Felker
2012-04-17 23:08:58 -04:00
parent 2dd5dc78d4
commit a12aa29185
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/stdio/vfwscanf.c
View File

@ -264,7 +264,9 @@ int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
} }
if (width) ungetwc(c, f); if (width) ungetwc(c, f);
if (!gotmatch) goto match_fail; if (!gotmatch)
if (c>=0) goto match_fail;
else goto input_fail;
if (*p==']') p++; if (*p==']') p++;
while (*p!=']') { while (*p!=']') {

2
src/stdio/vswscanf.c
View File

@ -17,7 +17,7 @@ static size_t wstring_read(FILE *f, unsigned char *buf, size_t len)
f->rend = f->buf + k; f->rend = f->buf + k;
f->cookie = (void *)src; f->cookie = (void *)src;
if (!len) return 0; if (!len || !k) return 0;
*buf = *f->rpos++; *buf = *f->rpos++;
return 1; return 1;