summaryrefslogtreecommitdiffstats
path: root/sys-utils/eject.c
diff options
context:
space:
mode:
authorKarel Zak2012-09-07 13:43:36 +0200
committerKarel Zak2012-09-07 13:43:56 +0200
commit92fe6e9633a5210d7b35ada393590192fd771ca7 (patch)
tree6ca7209d17653bcfdd51ef92bef5413f127fc19a /sys-utils/eject.c
parentwhereis: improve readability for analysers (diff)
downloadkernel-qcow2-util-linux-92fe6e9633a5210d7b35ada393590192fd771ca7.tar.gz
kernel-qcow2-util-linux-92fe6e9633a5210d7b35ada393590192fd771ca7.tar.xz
kernel-qcow2-util-linux-92fe6e9633a5210d7b35ada393590192fd771ca7.zip
eject: robust strings usage [coverity scan]
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'sys-utils/eject.c')
-rw-r--r--sys-utils/eject.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys-utils/eject.c b/sys-utils/eject.c
index 2097961ef..1a5b83409 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)