From: Rich Felker <dalias@aerifal.cx>
Date: Wed, 18 Apr 2012 03:08:58 +0000 (-0400)
Subject: fix failure to distinguish input/match failure in wide %[ scanf
X-Git-Tag: v0.8.8~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a12aa2918535fd370419bd24b50a33974091c5a7;p=oweals%2Fmusl.git

fix failure to distinguish input/match failure in wide %[ scanf

this also includes a related fix for vswscanf's read function, which
was returning a spurious (uninitialized) character for empty strings.
---

diff --git a/src/stdio/vfwscanf.c b/src/stdio/vfwscanf.c
index a52ba3a0..dbba8652 100644
--- a/src/stdio/vfwscanf.c
+++ b/src/stdio/vfwscanf.c
@@ -264,7 +264,9 @@ int vfwscanf(FILE *f, const wchar_t *fmt, va_list ap)
 			}
 			if (width) ungetwc(c, f);
 
-			if (!gotmatch) goto match_fail;
+			if (!gotmatch)
+				if (c>=0) goto match_fail;
+				else goto input_fail;
 
 			if (*p==']') p++;
 			while (*p!=']') {
diff --git a/src/stdio/vswscanf.c b/src/stdio/vswscanf.c
index 4396d7df..4c39f806 100644
--- a/src/stdio/vswscanf.c
+++ b/src/stdio/vswscanf.c
@@ -17,7 +17,7 @@ static size_t wstring_read(FILE *f, unsigned char *buf, size_t len)
 	f->rend = f->buf + k;
 	f->cookie = (void *)src;
 
-	if (!len) return 0;
+	if (!len || !k) return 0;
 
 	*buf = *f->rpos++;
 	return 1;