diff options
| author | Rich Felker <dalias@aerifal.cx> | 2013-07-20 00:21:11 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2013-07-20 00:21:11 -0400 |
| commit | 1d92cddb1e1ed4b6cc0e55461727561e7a2522e0 (patch) | |
| tree | d4f7a600da055639ac71aa28463d862d04fc91d7 /src | |
| parent | 8389520ed5ad6f0033d6426e21ef653fa5ca26a4 (diff) | |
| download | musl-1d92cddb1e1ed4b6cc0e55461727561e7a2522e0.tar.gz | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/stdio/vfscanf.c | 2 | ||||
| -rw-r--r-- | src/stdio/vfwscanf.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/stdio/vfscanf.c b/src/stdio/vfscanf.c index bb928480..68c8e2cf 100644 --- a/src/stdio/vfscanf.c +++ b/src/stdio/vfscanf.c @@ -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); diff --git a/src/stdio/vfwscanf.c b/src/stdio/vfwscanf.c index 760864ff..44fac78e 100644 --- a/src/stdio/vfwscanf.c +++ b/src/stdio/vfwscanf.c @@ -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++; |