repo-config: give value_ a sane default so regexec won't segfault

jonas · Junio C Hamano · commit f067a13745fb · 2006-03-07T17:06:10.000-08:00
Signed-off-by: Jonas Fonseca &lt;fonseca@diku.dk&gt;
Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
diff --git a/repo-config.c b/repo-config.c
@@ -14,6 +14,9 @@ static enum { T_RAW, T_INT, T_BOOL } type = T_RAW;
 
 static int show_config(const char* key_, const char* value_)
 {
+	if (value_ == NULL)
+		value_ = "";
+
 	if (!strcmp(key_, key) &&
 			(regexp == NULL ||
 			 (do_not_match ^
@@ -35,7 +38,7 @@ static int show_config(const char* key_, const char* value_)
 			sprintf(value, "%s", git_config_bool(key_, value_)
 					     ? "true" : "false");
 		} else {
-			value = strdup(value_ ? value_ : "");
+			value = strdup(value_);
 		}
 		seen++;
 	}
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
@@ -247,5 +247,13 @@ EOF
 
 test_expect_success 'hierarchical section value' 'cmp .git/config expect'
 
+cat > .git/config << EOF
+[novalue]
+	variable
+EOF
+
+test_expect_success 'get variable with no value' \
+	'git-repo-config --get novalue.variable ^$'
+
 test_done
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ static enum { T_RAW, T_INT, T_BOOL } type = T_RAW;`
`14`	`14`
`15`	`15`	`static int show_config(const char* key_, const char* value_)`
`16`	`16`	`{`
	`17`	`+ if (value_ == NULL)`
	`18`	`+ value_ = "";`
	`19`	`+`
`17`	`20`	`if (!strcmp(key_, key) &&`
`18`	`21`	`(regexp == NULL \|\|`
`19`	`22`	`(do_not_match ^`
`@@ -35,7 +38,7 @@ static int show_config(const char* key_, const char* value_)`
`35`	`38`	`sprintf(value, "%s", git_config_bool(key_, value_)`
`36`	`39`	`? "true" : "false");`
`37`	`40`	`} else {`
`38`		`- value = strdup(value_ ? value_ : "");`
	`41`	`+ value = strdup(value_);`
`39`	`42`	`}`
`40`	`43`	`seen++;`
`41`	`44`	`}`