diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-01-15 23:48:20 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-01-15 23:48:20 +0000 |
| commit | 0f740059389e194e62ce975527bcafa26b99b8d8 (patch) | |
| tree | 4e69c3e9fa360a0167c0f4e8ebf6ed470c700382 | |
| parent | c16abc04e8a7d4a9f6883b594b8a85765a8549a1 (diff) | |
| download | glibc-0f740059389e194e62ce975527bcafa26b99b8d8.zip glibc-0f740059389e194e62ce975527bcafa26b99b8d8.tar.gz glibc-0f740059389e194e62ce975527bcafa26b99b8d8.tar.bz2 | |
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>.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | stdio-common/vfscanf.c | 3 |
2 files changed, 8 insertions, 1 deletions
@@ -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 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) |