From: Ulrich Drepper Date: Wed, 15 Jan 2003 23:48:20 +0000 (+0000) Subject: Update. X-Git-Tag: upstream/2.30~20246 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f740059389e194e62ce975527bcafa26b99b8d8;p=external%2Fglibc.git Update. 2003-01-15 Ulrich Drepper * stdio-common/vfscanf.c: When recognizing multibyte characters in string reset the byte counter after mbrtowc reported it is not a partial character. Reported by Al Viro . --- diff --git a/ChangeLog b/ChangeLog index 4238f5e..07bd5ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-01-15 Ulrich Drepper + + * stdio-common/vfscanf.c: When recognizing multibyte characters in + string reset the byte counter after mbrtowc reported it is not a + partial character. Reported by Al Viro . + 2003-01-15 Steven Munroe * sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S: Include diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c index 97163de..93d9099 100644 --- a/stdio-common/vfscanf.c +++ b/stdio-common/vfscanf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991-1999, 2000, 2001, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1991-2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -2108,6 +2108,7 @@ __vfscanf (FILE *s, const char *format, va_list argptr) assert (cnt < MB_CUR_MAX); continue; } + cnt = 0; ++wstr; if ((flags & MALLOC)