From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: gitster@pobox.com
Cc: git@vger.kernel.org, johannes.schindelin@gmx.de
Subject: [PATCH 3/3] grep: avoid leak of chartables in PCRE2
Date: Tue, 6 Aug 2019 01:50:14 -0700 [thread overview]
Message-ID: <20190806085014.47776-4-carenas@gmail.com> (raw)
In-Reply-To: <20190806085014.47776-1-carenas@gmail.com>
94da9193a6 ("grep: add support for PCRE v2", 2017-06-01) introduced
a small memory leak visible with valgrind in t7813.
Complete the creation of a PCRE2 specific variable that was missing from
the original change and free the generated table just like it is done
for PCRE1.
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
grep.c | 7 ++++---
grep.h | 1 +
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/grep.c b/grep.c
index e748a6d68c..3e14ec91a6 100644
--- a/grep.c
+++ b/grep.c
@@ -524,7 +524,6 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
PCRE2_UCHAR errbuf[256];
PCRE2_SIZE erroffset;
int options = PCRE2_MULTILINE;
- const uint8_t *character_tables = NULL;
int jitret;
int patinforet;
size_t jitsizearg;
@@ -535,9 +534,10 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
if (opt->ignore_case) {
if (has_non_ascii(p->pattern)) {
- character_tables = pcre2_maketables(pcre2_global_context);
+ p->pcre2_tables = pcre2_maketables(pcre2_global_context);
p->pcre2_compile_context = pcre2_compile_context_create(NULL);
- pcre2_set_character_tables(p->pcre2_compile_context, character_tables);
+ pcre2_set_character_tables(p->pcre2_compile_context,
+ p->pcre2_tables);
}
options |= PCRE2_CASELESS;
}
@@ -642,6 +642,7 @@ static void free_pcre2_pattern(struct grep_pat *p)
pcre2_match_data_free(p->pcre2_match_data);
pcre2_jit_stack_free(p->pcre2_jit_stack);
pcre2_match_context_free(p->pcre2_match_context);
+ free((void *)p->pcre2_tables);
}
#else /* !USE_LIBPCRE2 */
static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt)
diff --git a/grep.h b/grep.h
index 526c2db9ef..533165c21a 100644
--- a/grep.h
+++ b/grep.h
@@ -96,6 +96,7 @@ struct grep_pat {
pcre2_compile_context *pcre2_compile_context;
pcre2_match_context *pcre2_match_context;
pcre2_jit_stack *pcre2_jit_stack;
+ const uint8_t *pcre2_tables;
uint32_t pcre2_jit_on;
kwset_t kws;
unsigned fixed:1;
--
2.23.0.rc1
next prev parent reply other threads:[~2019-08-06 8:50 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-05 11:51 [PATCH 0/1] Fix a problem with PCRE2 and nedmalloc, found via Azure Pipelines Johannes Schindelin via GitGitGadget
2019-08-05 11:51 ` [PATCH 1/1] pcre2: allow overriding the system allocator Johannes Schindelin via GitGitGadget
2019-08-05 16:19 ` Carlo Arenas
2019-08-05 16:27 ` Carlo Arenas
2019-08-05 19:32 ` Johannes Schindelin
2019-08-05 19:26 ` Johannes Schindelin
2019-08-05 21:53 ` Junio C Hamano
2019-08-06 6:24 ` Carlo Arenas
2019-08-06 8:50 ` [PATCH 0/3] grep: no leaks (WIP) Carlo Marcelo Arenas Belón
2019-08-06 8:50 ` [PATCH 1/3] grep: make PCRE1 aware of custom allocator Carlo Marcelo Arenas Belón
2019-08-08 13:54 ` Johannes Schindelin
2019-08-08 15:19 ` Carlo Arenas
2019-08-06 8:50 ` [PATCH 2/3] grep: make PCRE2 " Carlo Marcelo Arenas Belón
2019-08-08 13:56 ` Johannes Schindelin
2019-08-08 14:32 ` Carlo Arenas
2019-08-06 8:50 ` Carlo Marcelo Arenas Belón [this message]
2019-08-06 16:36 ` [RFC PATCH v3 0/3] grep: no leaks or crashes (windows testing needed) Carlo Marcelo Arenas Belón
2019-08-06 16:36 ` [RFC PATCH v3 1/3] grep: make PCRE1 aware of custom allocator Carlo Marcelo Arenas Belón
2019-08-06 16:36 ` [RFC PATCH v3 2/3] grep: make PCRE2 " Carlo Marcelo Arenas Belón
2019-08-07 5:38 ` René Scharfe
2019-08-07 9:49 ` Carlo Arenas
2019-08-07 13:02 ` René Scharfe
2019-08-07 13:08 ` [PATCH 1/2] nedmalloc: do assignments only after the declaration section René Scharfe
2019-08-07 13:09 ` [PATCH 2/2] nedmalloc: avoid compiler warning about unused value René Scharfe
2019-08-08 2:35 ` [RFC PATCH v3 2/3] grep: make PCRE2 aware of custom allocator Carlo Arenas
2019-08-08 7:07 ` René Scharfe
2019-08-08 12:38 ` Carlo Arenas
2019-08-08 14:29 ` René Scharfe
2019-08-08 20:18 ` Johannes Schindelin
2019-08-07 18:15 ` Junio C Hamano
2019-08-06 16:36 ` [RFC PATCH v3 3/3] grep: avoid leak of chartables in PCRE2 Carlo Marcelo Arenas Belón
2019-08-06 16:48 ` [RFC PATCH v3 0/3] grep: no leaks or crashes (windows testing needed) Junio C Hamano
2019-08-07 21:39 ` [RFC PATCH v4 " Carlo Marcelo Arenas Belón
2019-08-07 21:39 ` [RFC PATCH v4 1/3] grep: make PCRE1 aware of custom allocator Carlo Marcelo Arenas Belón
2019-08-07 21:39 ` [RFC PATCH v4 2/3] grep: make PCRE2 " Carlo Marcelo Arenas Belón
2019-08-07 22:28 ` Junio C Hamano
2019-08-07 21:39 ` [RFC PATCH v4 3/3] grep: avoid leak of chartables in PCRE2 Carlo Marcelo Arenas Belón
2019-08-09 3:02 ` [RFC PATCH v5 0/3] grep: almost no more leaks, hopefully no crashes Carlo Marcelo Arenas Belón
2019-08-09 3:02 ` [RFC PATCH v5 1/3] grep: make PCRE1 aware of custom allocator Carlo Marcelo Arenas Belón
2019-08-09 3:02 ` [RFC PATCH v5 2/3] grep: make PCRE2 " Carlo Marcelo Arenas Belón
2019-08-27 9:07 ` Johannes Schindelin
2019-08-27 11:51 ` Carlo Arenas
2019-10-03 5:02 ` Junio C Hamano
2019-10-03 8:08 ` Johannes Schindelin
2019-10-03 11:17 ` Carlo Arenas
2019-10-03 18:23 ` Johannes Schindelin
2019-10-03 22:57 ` Junio C Hamano
2019-08-09 3:02 ` [RFC PATCH v5 3/3] grep: avoid leak of chartables in PCRE2 Carlo Marcelo Arenas Belón
2019-08-09 11:24 ` [RFC PATCH v5 0/3] grep: almost no more leaks, hopefully no crashes Carlo Arenas
2019-08-09 17:01 ` René Scharfe
2019-08-09 17:46 ` Junio C Hamano
2019-08-09 21:26 ` Johannes Schindelin
2019-08-10 3:03 ` [PATCH] SQUASH Carlo Marcelo Arenas Belón
2019-08-10 7:57 ` René Scharfe
2019-08-10 8:42 ` Carlo Arenas
2019-08-10 19:47 ` René Scharfe
2019-08-12 7:35 ` Carlo Arenas
2019-08-12 12:14 ` René Scharfe
2019-08-12 12:28 ` Carlo Arenas
2019-08-10 13:57 ` Johannes Schindelin
2019-08-10 3:05 ` [RFC PATCH v5 0/3] grep: almost no more leaks, hopefully no crashes Carlo Arenas
2019-08-10 7:56 ` René Scharfe
2019-08-10 12:40 ` Carlo Arenas
2019-08-10 21:16 ` René Scharfe
2019-08-08 20:21 ` [RFC PATCH v3 0/3] grep: no leaks or crashes (windows testing needed) Johannes Schindelin
2019-08-09 6:52 ` Carlo Arenas
2019-08-09 21:13 ` Johannes Schindelin
2019-10-16 12:06 [PATCH 0/3] Revive 'pcre2-chartables-leakfix' Johannes Schindelin via GitGitGadget
2019-10-16 12:06 ` [PATCH 3/3] grep: avoid leak of chartables in PCRE2 Johannes Schindelin via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190806085014.47776-4-carenas@gmail.com \
--to=carenas@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=johannes.schindelin@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).