Skip to content

Commit d5b9e6c

Browse files
matledJunio C Hamano
authored andcommitted
argv created by handle_alias should be NULL terminated
Signed-off-by: Matthias Lederhofer <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent dd4c591 commit d5b9e6c

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

git.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,13 +133,12 @@ static int handle_alias(int *argcp, const char ***argv)
133133
fflush(stderr);
134134
}
135135

136+
new_argv = realloc(new_argv, sizeof(char*) *
137+
(count + *argcp + 1));
136138
/* insert after command name */
137-
if (*argcp > 1) {
138-
new_argv = realloc(new_argv, sizeof(char*) *
139-
(count + *argcp));
140-
memcpy(new_argv + count, *argv + 1,
141-
sizeof(char*) * *argcp);
142-
}
139+
memcpy(new_argv + count, *argv + 1,
140+
sizeof(char*) * *argcp);
141+
new_argv[count+*argcp] = NULL;
143142

144143
*argv = new_argv;
145144
*argcp += count - 1;

0 commit comments

Comments
 (0)