From: kevlo <kevlo@openbsd.org>
Date: Fri, 8 Dec 2017 01:03:51 +0000 (+0000)
Subject: Fix the return value of fwscanf(3) when encountering an early matching
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=367240bd3bf23d13ce0cdd2fdaa27972e74e4d80;p=openbsd

Fix the return value of fwscanf(3) when encountering an early matching
failure.  This change brings fwscanf(3) back in line with fscanf(3).

From FreeBSD; ok deraadt@, millert@
---

diff --git a/lib/libc/stdio/vfwscanf.c b/lib/libc/stdio/vfwscanf.c
index 7827244c0b2..8cb83f69224 100644
--- a/lib/libc/stdio/vfwscanf.c
+++ b/lib/libc/stdio/vfwscanf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfwscanf.c,v 1.6 2016/10/30 05:07:06 jsg Exp $ */
+/*	$OpenBSD: vfwscanf.c,v 1.7 2017/12/08 01:03:51 kevlo Exp $ */
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -165,7 +165,7 @@ literal:
 				goto input_failure;
 			if (wi != c) {
 				__ungetwc(wi, fp);
-				goto input_failure;
+				goto match_failure;
 			}
 			nread++;
 			continue;