Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
builtin-apply.c: guard config parser from value=NULL
author
Junio C Hamano
<gitster@pobox.com>
Mon, 11 Feb 2008 18:44:49 +0000
(10:44 -0800)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 11 Feb 2008 21:11:36 +0000
(13:11 -0800)
apply.whitespace configuration expects a string value.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin-apply.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
40ea4ed
)
diff --git
a/builtin-apply.c
b/builtin-apply.c
index 15432b6782400b556333ee4117c7daaff20412ab..a11b1bbeee9568adbf8a3e32f77d14b132985061 100644
(file)
--- a/
builtin-apply.c
+++ b/
builtin-apply.c
@@
-2746,6
+2746,8
@@
static int apply_patch(int fd, const char *filename, int inaccurate_eof)
static int git_apply_config(const char *var, const char *value)
{
if (!strcmp(var, "apply.whitespace")) {
+ if (!value)
+ return config_error_nonbool(var);
apply_default_whitespace = xstrdup(value);
return 0;
}