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

Merge pull request #3038 from pks-t/fix-regcomp-retval-check

Browse Source 
Fix checking of return value for regcomp.
This commit is contained in:
Edward Thomson 2015-04-10 10:32:42 +02:00
commit eb1eb58449
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/config.c
View File

@ -478,7 +478,7 @@ int git_config_iterator_glob_new(git_config_iterator **out, const git_config *cf
iter = git__calloc(1, sizeof(all_iter)); iter = git__calloc(1, sizeof(all_iter));
GITERR_CHECK_ALLOC(iter); GITERR_CHECK_ALLOC(iter);
if ((result = regcomp(&iter->regex, regexp, REG_EXTENDED)) < 0) { if ((result = regcomp(&iter->regex, regexp, REG_EXTENDED)) != 0) {
giterr_set_regex(&iter->regex, result); giterr_set_regex(&iter->regex, result);
regfree(&iter->regex); regfree(&iter->regex);
git__free(iter); git__free(iter);
@ -513,7 +513,7 @@ int git_config_backend_foreach_match(
int error = 0; int error = 0;
if (regexp != NULL) { if (regexp != NULL) {
if ((error = regcomp(&regex, regexp, REG_EXTENDED)) < 0) { if ((error = regcomp(&regex, regexp, REG_EXTENDED)) != 0) {
giterr_set_regex(&regex, error); giterr_set_regex(&regex, error);
regfree(&regex); regfree(&regex);
return -1; return -1;
@ -1004,7 +1004,7 @@ int git_config_multivar_iterator_new(git_config_iterator **out, const git_config
if (regexp != NULL) { if (regexp != NULL) {
error = regcomp(&iter->regex, regexp, REG_EXTENDED); error = regcomp(&iter->regex, regexp, REG_EXTENDED);
if (error < 0) { if (error != 0) {
giterr_set_regex(&iter->regex, error); giterr_set_regex(&iter->regex, error);
error = -1; error = -1;
regfree(&iter->regex); regfree(&iter->regex);

4
src/config_file.c
View File

@ -576,7 +576,7 @@ static int config_set_multivar(
} }
result = regcomp(&preg, regexp, REG_EXTENDED); result = regcomp(&preg, regexp, REG_EXTENDED);
if (result < 0) { if (result != 0) {
giterr_set_regex(&preg, result); giterr_set_regex(&preg, result);
result = -1; result = -1;
goto out; goto out;
@ -662,7 +662,7 @@ static int config_delete_multivar(git_config_backend *cfg, const char *name, con
refcounted_strmap_free(map); refcounted_strmap_free(map);
result = regcomp(&preg, regexp, REG_EXTENDED); result = regcomp(&preg, regexp, REG_EXTENDED);
if (result < 0) { if (result != 0) {
giterr_set_regex(&preg, result); giterr_set_regex(&preg, result);
result = -1; result = -1;
goto out; goto out;

2
src/diff_driver.c
View File

@ -116,7 +116,7 @@ static int diff_driver_add_patterns(
if (error < 0) if (error < 0)
break; break;
if ((error = regcomp(&pat->re, buf.ptr, regex_flags)) < 0) { if ((error = regcomp(&pat->re, buf.ptr, regex_flags)) != 0) {
/* if regex fails to compile, warn? fail? */ /* if regex fails to compile, warn? fail? */
error = giterr_set_regex(&pat->re, error); error = giterr_set_regex(&pat->re, error);
regfree(&pat->re); regfree(&pat->re);

12
tests/config/read.c
View File

@ -350,6 +350,18 @@ static void check_glob_iter(git_config *cfg, const char *regexp, int expected)
git_config_iterator_free(iter); git_config_iterator_free(iter);
} }
void test_config_read__iterator_invalid_glob(void)
{
git_config *cfg;
git_config_iterator *iter;
cl_git_pass(git_config_open_ondisk(&cfg, cl_fixture("config/config9")));
cl_git_fail(git_config_iterator_glob_new(&iter, cfg, "*"));
git_config_free(cfg);
}
void test_config_read__iterator_glob(void) void test_config_read__iterator_glob(void)
{ {
git_config *cfg; git_config *cfg;