Fix crash when argc is 0

Closes Neverball#195
JayFoxRox · Sep 8, 2019 · 09a2a62 · 09a2a62
1 parent 50520e8
commit 09a2a62
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/ball/main.c b/ball/main.c
@@ -530,7 +530,7 @@ int main(int argc, char *argv[])
 {
     int t1, t0;
 
-    if (!fs_init(argv[0]))
+    if (!fs_init(argc > 0 ? argv[0] : NULL))
     {
         fprintf(stderr, "Failure to initialize virtual file system (%s)\n",
                 fs_error());

diff --git a/putt/main.c b/putt/main.c
@@ -289,7 +289,7 @@ int main(int argc, char *argv[])
 {
     int camera = 0;
 
-    if (!fs_init(argv[0]))
+    if (!fs_init(argc > 0 ? argv[0] : NULL))
     {
         fprintf(stderr, "Failure to initialize virtual file system (%s)\n",
                 fs_error());

diff --git a/share/common.c b/share/common.c
@@ -299,20 +299,23 @@ const char *base_name(const char *name)
 
 const char *dir_name(const char *name)
 {
-    static char buff[MAXSTR];
+    if (name && *name)
+    {
+        static char buff[MAXSTR];
 
-    char *sep;
+        char *sep;
 
-    SAFECPY(buff, name);
+        SAFECPY(buff, name);
 
-    if ((sep = (char *) path_last_sep(buff)))
-    {
-        if (sep == buff)
-            return "/";
+        if ((sep = (char *) path_last_sep(buff)))
+        {
+            if (sep == buff)
+                return "/";
 
-        *sep = '\0';
+            *sep = '\0';
 
-        return buff;
+            return buff;
+        }
     }
 
     return ".";

diff --git a/share/fs_stdio.c b/share/fs_stdio.c
@@ -42,7 +42,7 @@ static List  fs_path;
 
 int fs_init(const char *argv0)
 {
-    fs_dir_base  = strdup(dir_name(argv0));
+    fs_dir_base  = strdup(argv0 && *argv0 ? dir_name(argv0) : ".");
     fs_dir_write = NULL;
     fs_path      = NULL;
 

diff --git a/share/mapc.c b/share/mapc.c
@@ -2811,7 +2811,7 @@ int main(int argc, char *argv[])
     struct timeval time0;
     struct timeval time1;
 
-    if (!fs_init(argv[0]))
+    if (!fs_init(argc > 0 ? argv[0] : NULL))
     {
         fprintf(stderr, "Failure to initialize virtual file system: %s\n",
                 fs_error());