From: Damien Miller <djm@mindrot.org>
Date: Mon, 2 Sep 2019 00:28:42 +0000 (+1000)
Subject: fixed test in OSX closefrom() replacement
X-Git-Tag: V_8_1_P1~89
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=368f1cc2fbd6ad10c66bc1b67c2c04aebf8a04a8;p=thirdparty%2Fopenssh-portable.git

fixed test in OSX closefrom() replacement

from likan_999.student AT sina.com
---

diff --git a/openbsd-compat/bsd-closefrom.c b/openbsd-compat/bsd-closefrom.c
index 8b9a56278..8fadca2da 100644
--- a/openbsd-compat/bsd-closefrom.c
+++ b/openbsd-compat/bsd-closefrom.c
@@ -107,9 +107,9 @@ closefrom(int lowfd)
 	if ((fdinfo_buf = malloc(sz)) == NULL)
 		goto fallback;
 	r = proc_pidinfo(pid, PROC_PIDLISTFDS, 0, fdinfo_buf, sz);
-	if (r < 0 || r >= sz)
+	if (r < 0 || r > sz)
 		goto fallback;
-	for (i = 0; i < sz / (int)PROC_PIDLISTFD_SIZE; i++) {
+	for (i = 0; i < r / (int)PROC_PIDLISTFD_SIZE; i++) {
 		if (fdinfo_buf[i].proc_fd >= lowfd)
 			close(fdinfo_buf[i].proc_fd);
 	}