Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 Aug 2018 00:49:06 +0000 (UTC)
From:      Kyle Evans <kevans@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject:   svn commit: r338077 - stable/11/stand/libsa
Message-ID:  <201808200049.w7K0n6ea075358@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kevans
Date: Mon Aug 20 00:49:06 2018
New Revision: 338077
URL: https://svnweb.freebsd.org/changeset/base/338077

Log:
  MFC r337523: libsa: exit on EOF in ngets
  
  It was possible in some rare circumstances for ngets to behave terribly with
  bhyveload and some form of redirecting user input over a pipe.
  
  PR:		198706

Modified:
  stable/11/stand/libsa/gets.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/stand/libsa/gets.c
==============================================================================
--- stable/11/stand/libsa/gets.c	Mon Aug 20 00:47:51 2018	(r338076)
+++ stable/11/stand/libsa/gets.c	Mon Aug 20 00:49:06 2018	(r338077)
@@ -44,8 +44,11 @@ ngets(char *buf, int n)
     int c;
     char *lp;
 
-    for (lp = buf;;)
-	switch (c = getchar() & 0177) {
+    for (lp = buf;;) {
+	c = getchar();
+	if (c == -1)
+		break;
+	switch (c & 0177) {
 	case '\n':
 	case '\r':
 	    *lp = '\0';
@@ -79,6 +82,7 @@ ngets(char *buf, int n)
 		putchar(c);
 	    }
 	}
+    }
     /*NOTREACHED*/
 }
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808200049.w7K0n6ea075358>