public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin] newlib: vfwscanf: fix negation bug in %[ conversion
Date: Mon, 04 Dec 2017 16:13:00 -0000	[thread overview]
Message-ID: <20171204161324.35826.qmail@sourceware.org> (raw)

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 != ']')


                 reply	other threads:[~2017-12-04 16:13 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171204161324.35826.qmail@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=newlib-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).