fix some bugs in scanf %[ handling detected while writing the wide version

diff --git a/src/stdio/vfscanf.c b/src/stdio/vfscanf.c
index 926d8a9d13d4c3aa455aa8bb6c4610ac742dde7e..8be0d91c6689a7fe697b3a03a0444b863aef479d 100644 (file)
--- 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};