mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'jk/maint-1.6.0-trace-argv'
* jk/maint-1.6.0-trace-argv: fix GIT_TRACE segfault with shell-quoted aliases Conflicts: alias.c
This commit is contained in:
commit
2beba6beb0
8
alias.c
8
alias.c
|
@ -38,10 +38,7 @@ int split_cmdline(char *cmdline, const char ***argv)
|
|||
while (cmdline[++src]
|
||||
&& isspace(cmdline[src]))
|
||||
; /* skip */
|
||||
if (count >= size) {
|
||||
size += 16;
|
||||
*argv = xrealloc(*argv, sizeof(char *) * size);
|
||||
}
|
||||
ALLOC_GROW(*argv, count+1, size);
|
||||
(*argv)[count++] = cmdline + dst;
|
||||
} else if (!quoted && (c == '\'' || c == '"')) {
|
||||
quoted = c;
|
||||
|
@ -72,6 +69,9 @@ int split_cmdline(char *cmdline, const char ***argv)
|
|||
return error("unclosed quote");
|
||||
}
|
||||
|
||||
ALLOC_GROW(*argv, count+1, size);
|
||||
(*argv)[count] = NULL;
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue