Fix segfault on invalid arguments

Yelp · Jun 17, 2016 · b678dbf · b678dbf
1 parent 38dc560
commit b678dbf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/dumb-init.c b/dumb-init.c
@@ -173,6 +173,7 @@ char **parse_command(int argc, char *argv[]) {
         {"rewrite",      required_argument, NULL, 'r'},
         {"verbose",      no_argument,       NULL, 'v'},
         {"version",      no_argument,       NULL, 'V'},
+        {NULL,                     0,       NULL,   0},
     };
     while ((opt = getopt_long(argc, argv, "+hvVcr:", long_options, NULL)) != -1) {
         switch (opt) {

diff --git a/tests/cli_test.py b/tests/cli_test.py
@@ -21,6 +21,14 @@ def test_no_arguments_prints_usage(both_debug_modes, both_setsid_modes):
     )
 
 
+@pytest.mark.usefixtures('both_debug_modes', 'both_setsid_modes')
+def test_exits_invalid_with_invalid_args():
+    proc = Popen(('dumb-init', '--yolo', '/bin/true'), stderr=PIPE)
+    _, stderr = proc.communicate()
+    assert proc.returncode == 1
+    assert stderr == b"dumb-init: unrecognized option '--yolo'\n"
+
+
 @pytest.mark.parametrize('flag', ['-h', '--help'])
 def test_help_message(flag, both_debug_modes, both_setsid_modes, current_version):
     """dumb-init should say something useful when called with the help flag,