Changeset c9c1ccd in mainline

Timestamp:

2018-12-12T16:23:36Z (6 years ago)

Author:

GitHub <noreply@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4f38ad77, 91fc2dae, af8c793b

Parents:

737ebf3 (diff), 6abdef37 (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.

git-author:

Maurizio Lombardi <m.lombardi85@…> (2018-12-12 16:23:36)

git-committer:

GitHub <noreply@…> (2018-12-12 16:23:36)

Message:

Merge pull request #141 from maurizio-lombardi/mkext4_fix_loop

mkext4: fix infinite loop when passing an invalid argument.

File:

• uspace/app/mkext4/mkext4.c (modified) (5 diffs)

uspace/app/mkext4/mkext4.c

@@ -68 +68 @@
         ++argv;
 
-        while (*argv[0] == '-') {
+        while (*argv && *argv[0] == '-') {
                 if (str_cmp(*argv, "--size") == 0) {
                         --argc;
@@ -87 +87 @@
                         --argc;
                         ++argv;
+                        continue;
                 }
 
@@ -107 +108 @@
                         --argc;
                         ++argv;
+                        continue;
                 }
 
@@ -122 +124 @@
                         --argc;
                         ++argv;
+                        continue;
+                }
+
+                if (str_cmp(*argv, "--help") == 0) {
+                        syntax_print();
+                        return 0;
                 }
 
@@ -128 +136 @@
                         ++argv;
                         break;
+                } else {
+                        printf(NAME ": Invalid argument: %s\n", *argv);
+                        syntax_print();
+                        return 1;
                 }
         }