about summary refs log tree commit diff
path: root/stdio-common/vfscanf.c
diff options
context:
space:
mode:
Diffstat (limited to 'stdio-common/vfscanf.c')
-rw-r--r--stdio-common/vfscanf.c7
1 files changed, 3 insertions, 4 deletions
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)