Skip to content

Commit 0460377

Browse files
authored
uspace/app/blkdump: fix argv null deref (#251)
1 parent a22c62f commit 0460377

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

uspace/app/blkdump/blkdump.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ int main(int argc, char **argv)
9494
relative = true;
9595
}
9696

97-
if (str_cmp(*argv, "--offset") == 0) {
97+
if (*argv && str_cmp(*argv, "--offset") == 0) {
9898
--argc;
9999
++argv;
100100
if (*argv == NULL) {
@@ -114,7 +114,7 @@ int main(int argc, char **argv)
114114
++argv;
115115
}
116116

117-
if (str_cmp(*argv, "--count") == 0) {
117+
if (*argv && str_cmp(*argv, "--count") == 0) {
118118
--argc;
119119
++argv;
120120
if (*argv == NULL) {
@@ -135,6 +135,12 @@ int main(int argc, char **argv)
135135
}
136136

137137
devname:
138+
if (*argv == NULL) {
139+
printf(NAME ": Error, argument missing (device_name).\n");
140+
syntax_print();
141+
return 1;
142+
}
143+
138144
if (argc != 1) {
139145
printf(NAME ": Error, unexpected argument.\n");
140146
syntax_print();

0 commit comments

Comments
 (0)