RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix 2 eof-related bugs in scanf 

1. failed match of literal chars from the format string would always
return matching failure rather than input failure at eof, leading to
infinite loops in some programs.

2. unread of eof would wrongly adjust the character counts reported by
%n, yielding an off-by-one error.
This commit is contained in:
Rich Felker 2011-04-25 10:40:25 -04:00
parent db9915ee97
commit 5efc6af4eb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/stdio/__scanf.c
View File

@ -22,8 +22,7 @@ static int read(rctx_t *r)
static void unread(rctx_t *r) static void unread(rctx_t *r)
{ {
//if (r->u || r->w < 0) return; if (r->c < 0 || r->w < 0) return;
if (r->w < 0) return;
r->w++; r->w++;
r->u = 1; r->u = 1;
} }
@ -99,7 +98,9 @@ int __scanf(rctx_t *r, const wchar_t *fmt, va_list ap)
} else if (*p != '%' || p[1] == '%') { } else if (*p != '%' || p[1] == '%') {
if (*p == '%') p++; if (*p == '%') p++;
r->w = 1; r->w = 1;
if (*p++ != read(r)) if ((c = read(r)) < 0)
goto input_fail;
if (*p++ != c)
goto match_fail; goto match_fail;
continue; continue;
} }