Use xrealloc instead of realloc
Change places that use realloc, without a proper error path, to instead use xrealloc. Drop an erroneous error path in the daemon code that used errno in the die message in favour of the simpler xrealloc. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:

committed by
Junio C Hamano

parent
095c424d08
commit
83572c1a91
6
git.c
6
git.c
@ -120,7 +120,7 @@ static int split_cmdline(char *cmdline, const char ***argv)
|
||||
; /* skip */
|
||||
if (count >= size) {
|
||||
size += 16;
|
||||
*argv = realloc(*argv, sizeof(char*) * size);
|
||||
*argv = xrealloc(*argv, sizeof(char*) * size);
|
||||
}
|
||||
(*argv)[count++] = cmdline + dst;
|
||||
} else if(!quoted && (c == '\'' || c == '"')) {
|
||||
@ -191,8 +191,8 @@ static int handle_alias(int *argcp, const char ***argv)
|
||||
fflush(stderr);
|
||||
}
|
||||
|
||||
new_argv = realloc(new_argv, sizeof(char*) *
|
||||
(count + *argcp + 1));
|
||||
new_argv = xrealloc(new_argv, sizeof(char*) *
|
||||
(count + *argcp + 1));
|
||||
/* insert after command name */
|
||||
memcpy(new_argv + count, *argv + 1, sizeof(char*) * *argcp);
|
||||
new_argv[count+*argcp] = NULL;
|
||||
|
Reference in New Issue
Block a user