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

Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/repo-config.c b/repo-config.c
index 9cf65193f95022e50e51d380ca050bef87653555..c5ebb7668a2632ef94cc798552ddd3f6f173e4f4 100644 (file)
--- 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_)
 {
 
 static int show_config(const char* key_, const char* value_)
 {

+       if (value_ == NULL)
+               value_ = "";
+

        if (!strcmp(key_, key) &&
                        (regexp == NULL ||
                         (do_not_match ^
        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 {
                        sprintf(value, "%s", git_config_bool(key_, value_)
                                             ? "true" : "false");
                } else {

-                       value = strdup(value_ ? value_ : "");
+                       value = strdup(value_);

                }
                seen++;
        }
                }
                seen++;
        }

diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 207dd3de6484518018b4eb7efe26dc449a9f71cd..ab4dd5c4ce14c496e1239a0013952c4c422a6a50 100755 (executable)
--- 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'
 
 
 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
 
 test_done