fixed horrible bug causing memory access after last argument in 'argv[]'

[rocksndiamonds.git] / src / libgame / misc.c

diff --git a/src/libgame/misc.c b/src/libgame/misc.c
index c1e8eee4f9c492a11ba7829282c967a89b09e4b8..3a7c28f4a3b0fe51fcf1d32e755286c119cab217 100644 (file)
--- a/src/libgame/misc.c
+++ b/src/libgame/misc.c
@@ -942,13 +942,18 @@ boolean strSuffixLower(char *s, char *suffix)
 /* command line option handling functions                                    */
 /* ------------------------------------------------------------------------- */
 
 /* command line option handling functions                                    */
 /* ------------------------------------------------------------------------- */
 

-void GetOptions(char *argv[],
+void GetOptions(int argc, char *argv[],

                void (*print_usage_function)(void),
                void (*print_version_function)(void))
 {
   char *ro_base_path = RO_BASE_PATH;
   char *rw_base_path = RW_BASE_PATH;
                void (*print_usage_function)(void),
                void (*print_version_function)(void))
 {
   char *ro_base_path = RO_BASE_PATH;
   char *rw_base_path = RW_BASE_PATH;

-  char **options_left = &argv[1];
+  char **argvplus = checked_calloc((argc + 1) * sizeof(char **));
+  char **options_left = &argvplus[1];
+
+  /* replace original "argv" with null-terminated array of string pointers */
+  while (argc--)
+    argvplus[argc] = argv[argc];

 
   /* if the program is configured to start from current directory (default),
      determine program package directory from program binary (some versions
 
   /* if the program is configured to start from current directory (default),
      determine program package directory from program binary (some versions