Do not call regfree() on an empty regex that is not successfully crea…

…ted by regcomp (also removed an unused member "has_regex" from all_iter)
libgit2 · May 18, 2015 · 822af03 · 822af03
1 parent 1c01006
commit 822af03
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/config.c b/src/config.c
@@ -335,7 +335,6 @@ typedef struct {
 	git_config_iterator *current;
 	const git_config *cfg;
 	regex_t regex;
-	int has_regex;
 	size_t i;
 } all_iter;
 
@@ -472,7 +471,6 @@ int git_config_iterator_glob_new(git_config_iterator **out, const git_config *cf
 
 	if ((result = regcomp(&iter->regex, regexp, REG_EXTENDED)) != 0) {
 		giterr_set_regex(&iter->regex, result);
-		regfree(&iter->regex);
 		git__free(iter);
 		return -1;
 	}
@@ -895,7 +893,8 @@ void multivar_iter_free(git_config_iterator *_iter)
 	iter->iter->free(iter->iter);
 
 	git__free(iter->name);
-	regfree(&iter->regex);
+	if (iter->have_regex)
+		regfree(&iter->regex);
 	git__free(iter);
 }