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

use xstrdup, not strdup in ll-merge.c

Browse Source 
Otherwise, a fluky allocation failure would cause merge
configuration settings to be silently ignored.

Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jim Meyering 2009-06-14 21:47:54 +02:00 committed by Junio C Hamano
parent c97038d1cf
commit 90dce51584
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ll-merge.c
View File

@ -233,7 +233,7 @@ static int read_merge_config(const char *var, const char *value, void *cb)
if (!strcmp(var, "merge.default")) { if (!strcmp(var, "merge.default")) {
if (value) if (value)
default_ll_merge = strdup(value); default_ll_merge = xstrdup(value);
return 0; return 0;
} }
@ -267,7 +267,7 @@ static int read_merge_config(const char *var, const char *value, void *cb)
if (!strcmp("name", ep)) { if (!strcmp("name", ep)) {
if (!value) if (!value)
return error("%s: lacks value", var); return error("%s: lacks value", var);
fn->description = strdup(value); fn->description = xstrdup(value);
return 0; return 0;
} }
@ -290,14 +290,14 @@ static int read_merge_config(const char *var, const char *value, void *cb)
* file named by %A, and signal that it has done with zero exit * file named by %A, and signal that it has done with zero exit
* status. * status.
*/ */
fn->cmdline = strdup(value); fn->cmdline = xstrdup(value);
return 0; return 0;
} }
if (!strcmp("recursive", ep)) { if (!strcmp("recursive", ep)) {
if (!value) if (!value)
return error("%s: lacks value", var); return error("%s: lacks value", var);
fn->recursive = strdup(value); fn->recursive = xstrdup(value);
return 0; return 0;
} }