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 /diffcore-pickaxe.c | |
| parent | 3f384aaac4cce1d06dbb53794f658ce8ddbf685d (diff) | |
| parent | 17154b1576f8be5aa3044f3adadb5473da618a42 (diff) | |
| download | git-d89f1248aaf4bb5d1094bc991a50839411935cf6.tar.xz | |
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 'diffcore-pickaxe.c')
| -rw-r--r-- | diffcore-pickaxe.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c index 239ce5122b..800a899c86 100644 --- a/diffcore-pickaxe.c +++ b/diffcore-pickaxe.c @@ -215,7 +215,6 @@ static void regcomp_or_die(regex_t *regex, const char *needle, int cflags) /* The POSIX.2 people are surely sick */ char errbuf[1024]; regerror(err, regex, errbuf, 1024); - regfree(regex); die("invalid regex: %s", errbuf); } } |