Disallow argc < 1 (for now just crash)

Since argc is allowed to be zero, and it's possible that any number of
things haven't been written to handle it, just crash for now if we
encounter it.

cf. https://lwn.net/Articles/882799/

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/dev/python.c b/dev/python.c
index 52acab9a20d4d0efbef47c777c668edae64c8b53..717b927c11c3af933dd61266bb30097a6be2b6e8 100644 (file)
--- a/dev/python.c
+++ b/dev/python.c
@@ -19,5 +19,6 @@
 
 int main(int argc, char **argv)
 {
+    assert(argc > 0);
     return bup_py_main (argc, argv);
 }

diff --git a/lib/cmd/bup.c b/lib/cmd/bup.c
index 66faef1e7bb185dde815fa74f2332bb77870008b..482960be052b05731def8764467bbcd13e09357e 100644 (file)
--- a/lib/cmd/bup.c
+++ b/lib/cmd/bup.c
@@ -329,6 +329,7 @@ prepend_lib_to_pythonpath(const char * const exec_path,
 
 int main(int argc, char **argv)
 {
+    assert(argc > 0);
     prog_argc = argc;
     prog_argv = argv;
     setup_bup_main_module();
@@ -356,6 +357,7 @@ int main(int argc, char **argv)
 
 int main(int argc, char **argv)
 {
+    assert(argc > 0);
     prog_argc = argc;
     prog_argv = argv;
     setup_bup_main_module();

diff --git a/src/bup/compat.c b/src/bup/compat.c
index 2a29c05fc9f525e73a710bda5342c5230d325d82..98858ae2ee281628f55276b2b4edb1da615e77bf 100644 (file)
--- a/src/bup/compat.c
+++ b/src/bup/compat.c
@@ -14,6 +14,7 @@
 
 int bup_py_bytes_main(int argc, char **argv)
 {
+    assert(argc > 0);
     wchar_t **wargv = PyMem_RawMalloc(argc * sizeof(wchar_t *));
     if (!wargv)
         die(2, "memory insufficient to decode command line arguments");