Skip to content

Commit d89f124

Browse files
committed
Merge branch 'ma/regex-no-regfree-after-comp-fail'
We used to call regfree() after regcomp() failed in some codepaths, which have been corrected. * ma/regex-no-regfree-after-comp-fail: regex: do not call `regfree()` if compilation fails
2 parents 3f384aa + 17154b1 commit d89f124

File tree

2 files changed

+0
-3
lines changed

2 files changed

+0
-3
lines changed

diffcore-pickaxe.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@ static void regcomp_or_die(regex_t *regex, const char *needle, int cflags)
215215
/* The POSIX.2 people are surely sick */
216216
char errbuf[1024];
217217
regerror(err, regex, errbuf, 1024);
218-
regfree(regex);
219218
die("invalid regex: %s", errbuf);
220219
}
221220
}

grep.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,6 @@ static void compile_fixed_regexp(struct grep_pat *p, struct grep_opt *opt)
636636
if (err) {
637637
char errbuf[1024];
638638
regerror(err, &p->regexp, errbuf, sizeof(errbuf));
639-
regfree(&p->regexp);
640639
compile_regexp_failed(p, errbuf);
641640
}
642641
}
@@ -701,7 +700,6 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
701700
if (err) {
702701
char errbuf[1024];
703702
regerror(err, &p->regexp, errbuf, 1024);
704-
regfree(&p->regexp);
705703
compile_regexp_failed(p, errbuf);
706704
}
707705
}

0 commit comments

Comments
 (0)