提交 5efc6af4 编写于 作者: R Rich Felker

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.
上级 db9915ee
......@@ -22,8 +22,7 @@ static int read(rctx_t *r)
static void unread(rctx_t *r)
{
//if (r->u || r->w < 0) return;
if (r->w < 0) return;
if (r->c < 0 || r->w < 0) return;
r->w++;
r->u = 1;
}
......@@ -99,7 +98,9 @@ int __scanf(rctx_t *r, const wchar_t *fmt, va_list ap)
} else if (*p != '%' || p[1] == '%') {
if (*p == '%') p++;
r->w = 1;
if (*p++ != read(r))
if ((c = read(r)) < 0)
goto input_fail;
if (*p++ != c)
goto match_fail;
continue;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册