undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/maint-1.6.0-trace-argv' into maint

Browse Source 
* jk/maint-1.6.0-trace-argv:
  fix GIT_TRACE segfault with shell-quoted aliases

Conflicts:
	alias.c
This commit is contained in:
Junio C Hamano 2009-05-25 19:03:20 -07:00
commit 417653777a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
alias.c
View File

@ -38,10 +38,7 @@ int split_cmdline(char *cmdline, const char ***argv)
while (cmdline[++src] while (cmdline[++src]
&& isspace(cmdline[src])) && isspace(cmdline[src]))
; /* skip */ ; /* skip */
if (count >= size) { ALLOC_GROW(*argv, count+1, size);
size += 16;
*argv = xrealloc(*argv, sizeof(char *) * size);
}
(*argv)[count++] = cmdline + dst; (*argv)[count++] = cmdline + dst;
} else if (!quoted && (c == '\'' || c == '"')) { } else if (!quoted && (c == '\'' || c == '"')) {
quoted = c; quoted = c;
@ -72,6 +69,9 @@ int split_cmdline(char *cmdline, const char ***argv)
return error("unclosed quote"); return error("unclosed quote");
} }
ALLOC_GROW(*argv, count+1, size);
(*argv)[count] = NULL;
return count; return count;
} }