diff options
author | Matthias Lederhofer <matled@gmx.net> | 2006-07-14 18:37:06 +0200 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-07-14 11:32:39 -0700 |
commit | d5b9e6cfa7a20932ca17649c9172619c9d961db4 (patch) | |
tree | caf5179b02c212fc6dca478b7540a29676bf0da9 | |
parent | dd4c59121ff8277d49a64a8f105936878a9fd7af (diff) | |
download | git-d5b9e6cfa7a20932ca17649c9172619c9d961db4.tar.gz git-d5b9e6cfa7a20932ca17649c9172619c9d961db4.tar.xz |
argv created by handle_alias should be NULL terminated
Signed-off-by: Matthias Lederhofer <matled@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r-- | git.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -133,13 +133,12 @@ static int handle_alias(int *argcp, const char ***argv) fflush(stderr); } + new_argv = realloc(new_argv, sizeof(char*) * + (count + *argcp + 1)); /* insert after command name */ - if (*argcp > 1) { - new_argv = realloc(new_argv, sizeof(char*) * - (count + *argcp)); - memcpy(new_argv + count, *argv + 1, - sizeof(char*) * *argcp); - } + memcpy(new_argv + count, *argv + 1, + sizeof(char*) * *argcp); + new_argv[count+*argcp] = NULL; *argv = new_argv; *argcp += count - 1; |