summaryrefslogtreecommitdiff
path: root/grep.c
diff options
context:
space:
mode:
authorMartin Ågren <martin.agren@gmail.com>2018-05-20 10:50:32 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-21 04:58:32 (GMT)
commit17154b1576f8be5aa3044f3adadb5473da618a42 (patch)
tree38f1785f400756a59acc50c78755f78ef1be0a89 /grep.c
parent468165c1d8a442994a825f3684528361727cd8c0 (diff)
downloadgit-17154b1576f8be5aa3044f3adadb5473da618a42.zip
git-17154b1576f8be5aa3044f3adadb5473da618a42.tar.gz
git-17154b1576f8be5aa3044f3adadb5473da618a42.tar.bz2
regex: do not call `regfree()` if compilation fails
It is apparently undefined behavior to call `regfree()` on a regex where `regcomp()` failed. The language in [1] is a bit muddy, at least to me, but the clearest hint is this (`preg` is the `regex_t *`): Upon successful completion, the regcomp() function shall return 0. Otherwise, it shall return an integer value indicating an error as described in <regex.h>, and the content of preg is undefined. Funnily enough, there is also the `regerror()` function which should be given a pointer to such a "failed" `regex_t` -- the content of which would supposedly be undefined -- and which may investigate it to come up with a detailed error message. In any case, the example in that document shows how `regfree()` is not called after `regcomp()` fails. We have quite a few users of this API and most get this right. These three users do not. Several implementations can handle this just fine [2] and these code paths supposedly have not wreaked havoc or we'd have heard about it. (These are all in code paths where git got bad input and is just about to die anyway.) But let's just avoid the issue altogether. [1] http://pubs.opengroup.org/onlinepubs/9699919799/functions/regcomp.html [2] https://www.redhat.com/archives/libvir-list/2013-September/msg00262.html Researched-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-byi Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'grep.c')
-rw-r--r--grep.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/grep.c b/grep.c
index 834b8eb..35fccf9 100644
--- a/grep.c
+++ b/grep.c
@@ -636,7 +636,6 @@ static void compile_fixed_regexp(struct grep_pat *p, struct grep_opt *opt)
if (err) {
char errbuf[1024];
regerror(err, &p->regexp, errbuf, sizeof(errbuf));
- regfree(&p->regexp);
compile_regexp_failed(p, errbuf);
}
}
@@ -701,7 +700,6 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
if (err) {
char errbuf[1024];
regerror(err, &p->regexp, errbuf, 1024);
- regfree(&p->regexp);
compile_regexp_failed(p, errbuf);
}
}