1 files changed, 10 insertions, 4 deletions

diff --git a/lib/libc/stdio/fgets.c b/lib/libc/stdio/fgets.c
index 9abf559bf108d..a2e39ed3b3370 100644
--- a/lib/libc/stdio/fgets.c
+++ b/lib/libc/stdio/fgets.c
@@ -37,6 +37,7 @@ static char sccsid[] = "@(#)fgets.c	8.2 (Berkeley) 12/22/93";
 __FBSDID("$FreeBSD$");
 
 #include "namespace.h"
+#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include "un-namespace.h"
@@ -55,11 +56,16 @@ fgets(char * __restrict buf, int n, FILE * __restrict fp)
 	char *s;
 	unsigned char *p, *t;
 
-	if (n <= 0)		/* sanity check */
-		return (NULL);
-
 	FLOCKFILE(fp);
 	ORIENT(fp, -1);
+
+	if (n <= 0) {		/* sanity check */
+		fp->_flags |= __SERR;
+		errno = EINVAL;
+		FUNLOCKFILE(fp);
+		return (NULL);
+	}
+
 	s = buf;
 	n--;			/* leave space for NUL */
 	while (n != 0) {
@@ -69,7 +75,7 @@ fgets(char * __restrict buf, int n, FILE * __restrict fp)
 		if ((len = fp->_r) <= 0) {
 			if (__srefill(fp)) {
 				/* EOF/error: stop with partial or no line */
-				if (s == buf) {
+				if (!__sfeof(fp) || s == buf) {
 					FUNLOCKFILE(fp);
 					return (NULL);
 				}