diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-02-11 11:00:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-11 13:11:37 -0800 |
| commit | d2370cc2960d3b0a090c57dfea99209c59b515f7 (patch) | |
| tree | 11217c91d247cac99812d36b5a07b7e546345801 | |
| parent | merge-recursive.c: guard config parser from value=NULL (diff) | |
| download | tgif-d2370cc2960d3b0a090c57dfea99209c59b515f7.tar.xz | |
remote.c: guard config parser from value=NULL
branch.*.{remote,merge} expect a string value
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | remote.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -222,15 +222,18 @@ static int handle_config(const char *key, const char *value) subkey = strrchr(name, '.'); if (!subkey) return 0; - if (!value) - return 0; branch = make_branch(name, subkey - name); if (!strcmp(subkey, ".remote")) { + if (!value) + return config_error_nonbool(key); branch->remote_name = xstrdup(value); if (branch == current_branch) 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)); + } return 0; } if (prefixcmp(key, "remote.")) |