From: Karel Zak <kzak@redhat.com>
Date: Fri, 7 Sep 2012 11:43:36 +0000 (+0200)
Subject: eject: robust strings usage [coverity scan]
X-Git-Tag: v2.23-rc1~709
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92fe6e9633a5210d7b35ada393590192fd771ca7;p=thirdparty%2Futil-linux.git

eject: robust strings usage [coverity scan]

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/eject.c b/sys-utils/eject.c
index 2097961ef2..1a5b834096 100644
--- a/sys-utils/eject.c
+++ b/sys-utils/eject.c
@@ -501,7 +501,7 @@ static int read_speed(const char *devname)
 
 	name = rindex(devname, '/') + 1;
 
-	while (!feof(f)) {
+	while (name && !feof(f)) {
 		char line[512];
 		char *str;
 
@@ -513,7 +513,7 @@ static int read_speed(const char *devname)
 			if (strncmp(line, "drive name:", 11) == 0) {
 				str = strtok(&line[11], "\t ");
 				drive_number = 0;
-				while (strncmp(name, str, strlen(name)) != 0) {
+				while (str && strncmp(name, str, strlen(name)) != 0) {
 					drive_number++;
 					str = strtok(NULL, "\t ");
 					if (!str)