Commit acead48c authored by Alexandre Julliard's avatar Alexandre Julliard

Fixed a couple of crashes.

parent cadf6fc1
...@@ -277,9 +277,12 @@ void spawn(const char* prefix, const strarray* args) ...@@ -277,9 +277,12 @@ void spawn(const char* prefix, const strarray* args)
{ {
int i, status; int i, status;
strarray* arr = strarray_dup(args); strarray* arr = strarray_dup(args);
const char** argv = arr->base; const char** argv;
char* prog = 0; char* prog = 0;
strarray_add(arr, NULL);
argv = arr->base;
if (prefix) if (prefix)
{ {
const char* p; const char* p;
...@@ -294,7 +297,6 @@ void spawn(const char* prefix, const strarray* args) ...@@ -294,7 +297,6 @@ void spawn(const char* prefix, const strarray* args)
} }
} }
strarray_add(arr, NULL);
if (verbose) if (verbose)
{ {
for(i = 0; argv[i]; i++) printf("%s ", argv[i]); for(i = 0; argv[i]; i++) printf("%s ", argv[i]);
......
...@@ -669,6 +669,7 @@ int main(int argc, char **argv) ...@@ -669,6 +669,7 @@ int main(int argc, char **argv)
case 'x': case 'o': case 'D': case 'U': case 'x': case 'o': case 'D': case 'U':
case 'I': case 'A': case 'l': case 'u': case 'I': case 'A': case 'l': case 'u':
case 'b': case 'V': case 'G': case 'L': case 'b': case 'V': case 'G': case 'L':
case 'B':
if (argv[i][2]) option_arg = &argv[i][2]; if (argv[i][2]) option_arg = &argv[i][2];
else next_is_arg = 1; else next_is_arg = 1;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment