rnd-20000718-1-src

[rocksndiamonds.git] / src / misc.c

diff --git a/src/misc.c b/src/misc.c
index 40bfad4bf83cea07b73f21b6fd9d25e5f0301fb1..c32aa55515b13650e2ba97a7f21cdfd85c38def3 100644 (file)
--- a/src/misc.c
+++ b/src/misc.c
@@ -334,7 +334,12 @@ char *getPath3(char *path1, char *path2, char *path3)
 
 char *getStringCopy(char *s)
 {
-  char *s_copy = checked_malloc(strlen(s) + 1);
+  char *s_copy;
+
+  if (s == NULL)
+    return NULL;
+
+  s_copy = checked_malloc(strlen(s) + 1);
 
   strcpy(s_copy, s);
   return s_copy;
@@ -438,7 +443,7 @@ void GetOptions(char *argv[])
             "Options:\n"
             "  -d, --display machine:0       X server display\n"
             "  -b, --basepath directory      alternative base directory\n"
-            "  -l, --levels directory        alternative level directory\n"
+            "  -l, --level directory        alternative level directory\n"
             "  -s, --serveronly              only start network server\n"
             "  -n, --network                 network multiplayer game\n"
             "  -v, --verbose                 verbose mode\n",