summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2017-12-04 17:05:11 +0100
committerCorinna Vinschen <corinna@vinschen.de>2017-12-04 17:05:11 +0100
commit67e628fa335cc5f5ef2c82e3b1609a6672d39266 (patch)
tree6fb072e70de9c0f650acc332722dfbaebd6bb0e0
parent8f7c712bb8db2a811bf8b8c6628d4f83a2118cc7 (diff)
downloadcygnal-67e628fa335cc5f5ef2c82e3b1609a6672d39266.tar.gz
cygnal-67e628fa335cc5f5ef2c82e3b1609a6672d39266.tar.bz2
cygnal-67e628fa335cc5f5ef2c82e3b1609a6672d39266.zip
newlib: vfwscanf: fix negation bug in %[ conversion
Old BSD bug: While ^ is recognized and the set of matching characters is negated, the code neglects to increment the pointer pointing to the matching characters. Thus, on a negation expression like %[^xyz], the matching doesn't only stop at x, y, or z, but incorrectly also on ^. Fix this by setting the start pointer after recognizing the ^. Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
-rw-r--r--newlib/libc/stdio/vfwscanf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/newlib/libc/stdio/vfwscanf.c b/newlib/libc/stdio/vfwscanf.c
index 9ef2bcae7..a286464e6 100644
--- a/newlib/libc/stdio/vfwscanf.c
+++ b/newlib/libc/stdio/vfwscanf.c
@@ -783,7 +783,6 @@ _DEFUN(__SVFWSCANF_R, (rptr, fp, fmt0, ap),
break;
case L'[':
- ccls = fmt;
if (*fmt == '^')
{
cclcompl = 1;
@@ -791,6 +790,7 @@ _DEFUN(__SVFWSCANF_R, (rptr, fp, fmt0, ap),
}
else
cclcompl = 0;
+ ccls = fmt;
if (*fmt == ']')
fmt++;
while (*fmt != '\0' && *fmt != ']')