[src/trunk]: src/lib/libc/stdio From OpenBSD:

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2d56ee2949d2
branches:  trunk
changeset: 347345:2d56ee2949d2
user:      christos <christos%NetBSD.org@localhost>
date:      Mon Aug 22 06:11:39 2016 +0000

description:
>From OpenBSD:
bugfix: when fgetwc(3) fails, fgetwln(3) must fail as well;

diffstat:

 lib/libc/stdio/fgetwln.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r ebe55e242560 -r 2d56ee2949d2 lib/libc/stdio/fgetwln.c
--- a/lib/libc/stdio/fgetwln.c  Mon Aug 22 04:15:58 2016 +0000
+++ b/lib/libc/stdio/fgetwln.c  Mon Aug 22 06:11:39 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fgetwln.c,v 1.5 2012/03/15 18:22:30 christos Exp $     */
+/*     $NetBSD: fgetwln.c,v 1.6 2016/08/22 06:11:39 christos Exp $     */
 
 /*-
  * Copyright (c) 2002-2004 Tim J. Robbins.
@@ -31,7 +31,7 @@
 #if 0
 __FBSDID("$FreeBSD: src/lib/libc/stdio/fgetwln.c,v 1.2 2004/08/06 17:00:09 tjr Exp $");
 #else
-__RCSID("$NetBSD: fgetwln.c,v 1.5 2012/03/15 18:22:30 christos Exp $");
+__RCSID("$NetBSD: fgetwln.c,v 1.6 2016/08/22 06:11:39 christos Exp $");
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -94,7 +94,7 @@
                if (wc == L'\n')
                        break;
        }
-       if (len == 0)
+       if (len == 0 || fp->flags & __SERR)
                goto error;
 
        FUNLOCKFILE(fp);