about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--stdio-common/vfscanf.c7
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 93383773df..e3e0b22791 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-08-22  Ulrich Drepper  <drepper@redhat.com>
 
+	* stdio-common/vfscanf.c: Fix handling of %l[].
+	Reported by Mitsuru Chinen <mchinen@yamato.ibm.com>.
+
 	* elf/dl-addr.c (_dl_addr): Fix tests to determine dli_sname.
 	* malloc/mtrace.c (tr_where): dli_sname always points to a
 	non-empty string if != NULL.
diff --git a/stdio-common/vfscanf.c b/stdio-common/vfscanf.c
index 3c5bccbdc6..4dc9cfe3a2 100644
--- a/stdio-common/vfscanf.c
+++ b/stdio-common/vfscanf.c
@@ -2090,19 +2090,18 @@ __vfscanf (FILE *s, const char *format, va_list argptr)
 		      size_t n;
 
 		      /* Convert it into a wide character.  */
-		      n = __mbrtowc (wstr, buf, cnt, &cstate);
+		      buf[0] = c;
+		      n = __mbrtowc (wstr, buf, 1, &cstate);
 
 		      if (n == (size_t) -2)
 			{
 			  /* Possibly correct character, just not enough
 			     input.  */
+			  ++cnt;
 			  assert (cnt < MB_CUR_MAX);
 			  continue;
 			}
 
-		      if (n != cnt)
-			encode_error ();
-
 		      ++wstr;
 		      if ((flags & MALLOC)
 			  && wstr == (wchar_t *) *strptr + strsize)