This is the mail archive of the newlib-cvs@sourceware.org mailing list for the newlib project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[newlib-cygwin] newlib: vfwscanf: fix negation bug in %[ conversion


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=67e628fa335cc5f5ef2c82e3b1609a6672d39266

commit 67e628fa335cc5f5ef2c82e3b1609a6672d39266
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Mon Dec 4 17:05:11 2017 +0100

    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>

Diff:
---
 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 9ef2bca..a286464 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 != ']')


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]