From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 35872 invoked by alias); 4 Dec 2017 16:13:24 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 35829 invoked by uid 9078); 4 Dec 2017 16:13:24 -0000 Date: Mon, 04 Dec 2017 16:13:00 -0000 Message-ID: <20171204161324.35826.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] newlib: vfwscanf: fix negation bug in %[ conversion X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 8f7c712bb8db2a811bf8b8c6628d4f83a2118cc7 X-Git-Newrev: 67e628fa335cc5f5ef2c82e3b1609a6672d39266 X-SW-Source: 2017-q4/txt/msg00076.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=67e628fa335cc5f5ef2c82e3b1609a6672d39266 commit 67e628fa335cc5f5ef2c82e3b1609a6672d39266 Author: Corinna Vinschen 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 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 != ']')