fix uninitialized/stale use of alloc (%m modifier) flag in scanf

for conversion specifiers, alloc is always set when the specifier is
parsed. however, if scanf stops due to mismatching literal text,
either an uninitialized (if no conversions have been performed yet) or
stale (from the previous conversion) of the flag will be used,
possibly causing an invalid pointer to be passed to free when the
function returns.
This commit is contained in:
Rich Felker 2013-07-20 00:21:11 -04:00
parent 8389520ed5
commit 1d92cddb1e
2 changed files with 4 additions and 0 deletions

View File

@ -81,6 +81,8 @@ int vfscanf(FILE *restrict f, const char *restrict fmt, va_list ap)
for (p=(const unsigned char *)fmt; *p; p++) {
alloc = 0;
if (isspace(*p)) {
while (isspace(p[1])) p++;
shlim(f, 0);

View File

@ -109,6 +109,8 @@ int vfwscanf(FILE *restrict f, const wchar_t *restrict fmt, va_list ap)
for (p=fmt; *p; p++) {
alloc = 0;
if (iswspace(*p)) {
while (iswspace(p[1])) p++;
while (iswspace((c=getwc(f)))) pos++;