From e0d9f780d171326a12bf9daf2af1e2f0c51c89f6 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 17 Apr 2012 14:22:22 -0400 Subject: fix some bugs in scanf %[ handling detected while writing the wide version --- src/stdio/vfscanf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/stdio/vfscanf.c b/src/stdio/vfscanf.c index 926d8a9d..8be0d91c 100644 --- a/src/stdio/vfscanf.c +++ b/src/stdio/vfscanf.c @@ -227,14 +227,14 @@ int vfscanf(FILE *f, const char *fmt, va_list ap) scanset[0] = 0; if (*p == '-') p++, scanset[1+'-'] = 1-invert; - if (*p == ']') p++, scanset[1+']'] = 1-invert; - for (; *p && *p != ']'; p++) { - if (*p=='-' && p[1] != ']') + else if (*p == ']') p++, scanset[1+']'] = 1-invert; + for (; *p != ']'; p++) { + if (!*p) goto fmt_fail; + if (*p=='-' && p[1] && p[1] != ']') for (c=p++[-1]; c<*p; c++) scanset[1+c] = 1-invert; scanset[1+*p] = 1-invert; } - if (!*p) goto fmt_fail; if (size == SIZE_l) { st = (mbstate_t){0}; -- cgit v1.2.1