From: Karel Zak <kzak@redhat.com>
Date: Mon, 27 Apr 2020 09:15:00 +0000 (+0200)
Subject: libfdisk: (script) fix partno_from_devname()
X-Git-Tag: v2.36-rc1~131
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=243fff1dc6c3d59d9c3eb9ced472584b5ae8bbd2;p=thirdparty%2Futil-linux.git

libfdisk: (script) fix partno_from_devname()

Addresses: https://github.com/karelzak/util-linux/issues/1015
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/libfdisk/src/script.c b/libfdisk/src/script.c
index cc53c3b7db..8af2e54cd2 100644
--- a/libfdisk/src/script.c
+++ b/libfdisk/src/script.c
@@ -953,12 +953,17 @@ static int partno_from_devname(char *s)
 	size_t sz;
 	char *end, *p;
 
+	if (!s || !*s)
+		return -1;
+
 	sz = rtrim_whitespace((unsigned char *)s);
-	p = s + sz - 1;
+	end = p = s + sz;
 
 	while (p > s && isdigit(*(p - 1)))
 		p--;
-
+	if (p == end)
+		return -1;
+	end = NULL;
 	errno = 0;
 	pno = strtol(p, &end, 10);
 	if (errno || !end || p == end)