Changeset aca1777 in mainline for uspace/app/blkdump/blkdump.c

Timestamp:

2025-05-08T17:12:05Z (3 months ago)

Author:

Miroslav Cimerman <mc@…>

Children:

2f21cd4

Parents:

1cfce3f (diff), 61f28c4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge upstream into helenraid

File:

• uspace/app/blkdump/blkdump.c (modified) (3 diffs)

uspace/app/blkdump/blkdump.c

@@ -95 +95 @@
         }
 
-        if (str_cmp(*argv, "--offset") == 0) {
+        if (*argv && str_cmp(*argv, "--offset") == 0) {
                 --argc;
                 ++argv;
@@ -115 +115 @@
         }
 
-        if (str_cmp(*argv, "--count") == 0) {
+        if (*argv && str_cmp(*argv, "--count") == 0) {
                 --argc;
                 ++argv;
@@ -136 +136 @@
 
 devname:
+        if (*argv == NULL) {
+                printf(NAME ": Error, argument missing (device_name).\n");
+                syntax_print();
+                return 1;
+        }
+
         if (argc != 1) {
                 printf(NAME ": Error, unexpected argument.\n");