diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | stdio-common/vfscanf.c | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 4238f5e878..07bd5ee4dd 100644 --- 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 97163de60d..93d909958d 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) |