git.c: avoid allocating one-too-many elements for new argv array

When creating a new argv array from a configured alias and the supplied command line arguments, the new argv was allocated with one element too many. Since the first element of the original argv array is skipped when copying it to the new_argv, the number of elements that are allocated should be reduced by one. 'count' is the number of elements that new_argv contains, and *argcp is the number of elements in the original argv array. So the total allocation (including the terminating NULL entry) for the new_argv array should be: count + (*argcp - 1) + 1 Also, the explicit assignment of the NULL terminating entry can be avoided by just copying it over from the original argv array. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Brandon Casey committed Jun 30, 2009 at 15:24 UTC 6167c136579f17066e985a8bf7d9c020878b9a3e

1 file changed +1 -2

git.c

+1 -2

@@ -188,10 +188,9 @@ static int handle_alias(int *argcp, const char ***argv)

188 alias_command);

189

190 new_argv = xrealloc(new_argv, sizeof(char *) *

191 - (count + *argcp + 1));

191 + (count + *argcp));

192 /* insert after command name */

193 memcpy(new_argv + count, *argv + 1, sizeof(char *) * *argcp);

194 - new_argv[count+*argcp] = NULL;

194

195 *argv = new_argv;

196 *argcp += count - 1;