diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-30 21:51:28 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-30 21:51:28 +0900 |
| commit | d89f1248aaf4bb5d1094bc991a50839411935cf6 (patch) | |
| tree | d4eb1fd78a3966afa8918812917e0583f604223c /grep.c | |
| parent | Merge branch 'ma/config-store-data-clear' (diff) | |
| parent | regex: do not call `regfree()` if compilation fails (diff) | |
| download | git-d89f1248aaf4bb5d1094bc991a50839411935cf6.tar.gz git-d89f1248aaf4bb5d1094bc991a50839411935cf6.zip | |
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
Diffstat (limited to 'grep.c')
| -rw-r--r-- | grep.c | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -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); } } |