Skip to content

Commit

Permalink
Fix checking of return value for regcomp.
Browse files Browse the repository at this point in the history
The regcomp function returns a non-zero value if compilation of
a regular expression fails. In most places we only check for
negative values, but positive values indicate an error, as well.
Fix this tree-wide, fixing a segmentation fault when calling
git_config_iterator_glob_new with an invalid regexp.
  • Loading branch information
pks-t authored and carlosmn committed May 18, 2015
1 parent 702ac40 commit 7661fa1
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src/config.c
Expand Up @@ -470,7 +470,7 @@ int git_config_iterator_glob_new(git_config_iterator **out, const git_config *cf
iter = git__calloc(1, sizeof(all_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);
regfree(&iter->regex);
git__free(iter);
Expand Down Expand Up @@ -505,7 +505,7 @@ int git_config_backend_foreach_match(
int error = 0;

if (regexp != NULL) {
if ((error = regcomp(&regex, regexp, REG_EXTENDED)) < 0) {
if ((error = regcomp(&regex, regexp, REG_EXTENDED)) != 0) {
giterr_set_regex(&regex, error);
regfree(&regex);
return -1;
Expand Down Expand Up @@ -916,7 +916,7 @@ int git_config_multivar_iterator_new(git_config_iterator **out, const git_config

if (regexp != NULL) {
error = regcomp(&iter->regex, regexp, REG_EXTENDED);
if (error < 0) {
if (error != 0) {
giterr_set_regex(&iter->regex, error);
error = -1;
regfree(&iter->regex);
Expand Down
4 changes: 2 additions & 2 deletions src/config_file.c
Expand Up @@ -568,7 +568,7 @@ static int config_set_multivar(
}

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

result = regcomp(&preg, regexp, REG_EXTENDED);
if (result < 0) {
if (result != 0) {
giterr_set_regex(&preg, result);
result = -1;
goto out;
Expand Down
2 changes: 1 addition & 1 deletion src/diff_driver.c
Expand Up @@ -116,7 +116,7 @@ static int diff_driver_add_patterns(
if (error < 0)
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? */
error = giterr_set_regex(&pat->re, error);
regfree(&pat->re);
Expand Down
12 changes: 12 additions & 0 deletions tests/config/read.c
Expand Up @@ -343,6 +343,18 @@ static void check_glob_iter(git_config *cfg, const char *regexp, int expected)
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)
{
git_config *cfg;
Expand Down

0 comments on commit 7661fa1

Please sign in to comment.