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

remote.c: guard config parser from value=NULL

Browse Source 
branch.*.{remote,merge} expect a string value

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2008-02-11 11:00:10 -08:00
parent e098368b5b
commit d2370cc296
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
remote.c
View File

@ -222,15 +222,18 @@ static int handle_config(const char *key, const char *value)
subkey = strrchr(name, '.'); subkey = strrchr(name, '.');
if (!subkey) if (!subkey)
return 0; return 0;
if (!value)
return 0;
branch = make_branch(name, subkey - name); branch = make_branch(name, subkey - name);
if (!strcmp(subkey, ".remote")) { if (!strcmp(subkey, ".remote")) {
if (!value)
return config_error_nonbool(key);
branch->remote_name = xstrdup(value); branch->remote_name = xstrdup(value);
if (branch == current_branch) if (branch == current_branch)
default_remote_name = branch->remote_name; default_remote_name = branch->remote_name;
} else if (!strcmp(subkey, ".merge")) } else if (!strcmp(subkey, ".merge")) {
if (!value)
return config_error_nonbool(key);
add_merge(branch, xstrdup(value)); add_merge(branch, xstrdup(value));
}
return 0; return 0;
} }
if (prefixcmp(key, "remote.")) if (prefixcmp(key, "remote."))