projects
/
musl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dad4040
)
fix broken %s and %[ with no width specifier in wide scanf
author
Rich Felker
<dalias@aerifal.cx>
Wed, 18 Apr 2012 02:15:33 +0000
(22:15 -0400)
committer
Rich Felker
<dalias@aerifal.cx>
Wed, 18 Apr 2012 02:15:33 +0000
(22:15 -0400)
src/stdio/vfwscanf.c
patch
|
blob
|
history
diff --git
a/src/stdio/vfwscanf.c
b/src/stdio/vfwscanf.c
index
beb8e8f
..
a52ba3a
100644
(file)
--- a/
src/stdio/vfwscanf.c
+++ b/
src/stdio/vfwscanf.c
@@
-214,13
+214,14
@@
int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
break;
case 's':
break;
case 's':
+ if (width < 1) width = -1;
s = dest;
while (width && !iswspace(c=getwc(f)) && c!=EOF) {
int l = wctomb(s?s:tmp, c);
if (l<0) goto input_fail;
if (s) s+=l;
pos++;
s = dest;
while (width && !iswspace(c=getwc(f)) && c!=EOF) {
int l = wctomb(s?s:tmp, c);
if (l<0) goto input_fail;
if (s) s+=l;
pos++;
- width-
-
;
+ width-
=(width>0)
;
}
if (width) ungetwc(c, f);
if (s) *s = 0;
}
if (width) ungetwc(c, f);
if (s) *s = 0;
@@
-228,8
+229,9
@@
int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
case 'S':
wcs = dest;
case 'S':
wcs = dest;
+ if (width < 1) width = -1;
while (width && !iswspace(c=getwc(f)) && c!=EOF)
while (width && !iswspace(c=getwc(f)) && c!=EOF)
- width-
-
, pos++, *wcs++ = c;
+ width-
=(width>0)
, pos++, *wcs++ = c;
if (width) ungetwc(c, f);
if (wcs) *wcs = 0;
break;
if (width) ungetwc(c, f);
if (wcs) *wcs = 0;
break;
@@
-243,6
+245,8
@@
int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
int gotmatch = 0;
int gotmatch = 0;
+ if (width < 1) width = -1;
+
while (width) {
if ((c=getwc(f))<0) break;
if (in_set(p, c) == invert)
while (width) {
if ((c=getwc(f))<0) break;
if (in_set(p, c) == invert)
@@
-255,7
+259,7
@@
int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
if (s) s+=l;
}
pos++;
if (s) s+=l;
}
pos++;
- width-
-
;
+ width-
=(width>0)
;
gotmatch=1;
}
if (width) ungetwc(c, f);
gotmatch=1;
}
if (width) ungetwc(c, f);