proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 20:42:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3085 from yongthecoder/regfree

Browse Source 
Do not call regfree() on an empty regex that is not successfully created...
This commit is contained in:
Carlos Martín Nieto 2015-04-29 22:08:46 +02:00
commit 891cc5045f
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/config.c
View File

@ -343,7 +343,6 @@ typedef struct {
git_config_iterator *current;
const git_config *cfg;
regex_t regex;
int has_regex;
size_t i;
} all_iter;
@ -480,7 +479,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;
}
@ -983,7 +981,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);
}