merge-recursive.c: guard config parser from value=NULL

merge.default, merge.*.{name,driver} expect a string value Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Feb 11, 2008 at 10:59 UTC e098368b5b990eb05cbc60a271ab6d731820e0c2

1 file changed +6 -5

merge-recursive.c

+6 -5

@@ -844,8 +844,9 @@ static int read_merge_config(const char *var, const char *value)

844 int namelen;

845

846 if (!strcmp(var, "merge.default")) {

847 - if (value)

848 - default_ll_merge = strdup(value);

847 + if (!value)

848 + return config_error_nonbool(var);

849 + default_ll_merge = strdup(value);

850 return 0;

851 }

852

@@ -878,14 +879,14 @@ static int read_merge_config(const char *var, const char *value)

879

880 if (!strcmp("name", ep)) {

881 if (!value)

881 - return error("%s: lacks value", var);

882 + return config_error_nonbool(var);

883 fn->description = strdup(value);

884 return 0;

885 }

886

887 if (!strcmp("driver", ep)) {

888 if (!value)

888 - return error("%s: lacks value", var);

889 + return config_error_nonbool(var);

890 /*

891 * merge.<name>.driver specifies the command line:

892 *

@@ -908,7 +909,7 @@ static int read_merge_config(const char *var, const char *value)

909

910 if (!strcmp("recursive", ep)) {

911 if (!value)

911 - return error("%s: lacks value", var);

912 + return config_error_nonbool(var);

913 fn->recursive = strdup(value);

914 return 0;

915 }