From 67e628fa335cc5f5ef2c82e3b1609a6672d39266 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 4 Dec 2017 17:05:11 +0100 Subject: [PATCH] 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 --- newlib/libc/stdio/vfwscanf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 != ']')