1 files changed, 14 insertions, 4 deletions

diff --git a/win32/process.c b/win32/process.c
index 5c818a3c0..e93efa103 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -259,6 +259,19 @@ mingw_spawn_applet(int mode,
 }
 #endif
 
+/* Make a copy of an argv array with n extra slots at the start */
+char ** FAST_FUNC
+grow_argv(char **argv, int n)
+{
+        char **new_argv;
+        int argc;
+
+        argc = string_array_len(argv) + 1;
+        new_argv = xmalloc(sizeof(*argv) * (argc + n));
+        memcpy(new_argv + n, argv, sizeof(*argv) * argc);
+        return new_argv;
+}
+
 static intptr_t
 mingw_spawn_interpreter(int mode, const char *prog, char *const *argv,
                         char *const *envp, int level)
@@ -267,7 +280,6 @@ mingw_spawn_interpreter(int mode, const char *prog, char *const *argv,
         int nopts;
         interp_t interp;
         char **new_argv;
-        int argc;
         char *path = NULL;
 
         if (!parse_interpreter(prog, &interp))
@@ -279,11 +291,9 @@ mingw_spawn_interpreter(int mode, const char *prog, char *const *argv,
         }
 
         nopts = interp.opts != NULL;
-        argc = string_array_len((char **)argv);
-        new_argv = xmalloc(sizeof(*argv)*(argc+nopts+2));
+        new_argv = grow_argv((char **)(argv + 1), nopts + 2);
         new_argv[1] = interp.opts;
         new_argv[nopts+1] = (char *)prog; /* pass absolute path */
-        memcpy(new_argv+nopts+2, argv+1, sizeof(*argv)*argc);
 
 #if ENABLE_FEATURE_PREFER_APPLETS && NUM_APPLETS > 1
         if (unix_path(interp.path) && find_applet_by_name(interp.name) >= 0) {