From: Masatake YAMATO <yamato@redhat.com>
Date: Fri, 15 Oct 2021 17:34:38 +0000 (+0900)
Subject: lsfd: (helper) improve the code converting file descriptor numbers
X-Git-Tag: v2.38-rc1~144^2~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=adf7af0e709a0e9f4bda6f9af255baa64b153f14;p=thirdparty%2Futil-linux.git

lsfd: (helper) improve the code converting file descriptor numbers

Signed-off-by: Masatake YAMATO <yamato@redhat.com>
---

diff --git a/tests/helpers/test_mkfds.c b/tests/helpers/test_mkfds.c
index 369b291c64..80b4ffed2f 100644
--- a/tests/helpers/test_mkfds.c
+++ b/tests/helpers/test_mkfds.c
@@ -587,11 +587,16 @@ int main(int argc, char **argv)
 	for (int i = 0; i < factory->N; i++) {
 		char *str = argv[optind + i];
 		long fd;
+		char *ep;
 
-		errno  = 0;
-		fd = strtol(str, NULL, 10);
+		errno = 0;
+		fd = strtol(str, &ep, 10);
 		if (errno)
 			err(EXIT_FAILURE, "failed to convert fd number: %s", str);
+		if (ep == str)
+			errx(EXIT_FAILURE, "failed to convert fd number: %s", str);
+		if (*ep != '\0')
+			errx(EXIT_FAILURE, _("garbage at the end of number: %s"), str);
 		if (fd < 0)
 			errx(EXIT_FAILURE, "fd number should not be negative: %s", str);
 		if (fd < 3)