Update.

2003-01-15  Ulrich Drepper  <drepper@redhat.com>

	* 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 <aviro@redhat.com>.

diff --git a/ChangeLog b/ChangeLog
index 4238f5e878a10cac9a558ac1cda499c5d46fb175..07bd5ee4dd16cbc53fbda2a7b61ee171ff888719 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-01-15  Ulrich Drepper  <drepper@redhat.com>
+
+       * 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 <aviro@redhat.com>.
+
 2003-01-15  Steven Munroe  <sjmunroe@us.ibm.com>
 
        * sysdeps/unix/sysv/linux/powerpc/powerpc64/socket.S: Include

diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index 97163de60da0d324b5a16aa1de668127077d3dfe..93d909958db14ccdffafba9e74c96253a743c3e6 100644 (file)
--- 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)