From: Junio C Hamano <gitster@pobox.com> To: "Carlo Marcelo Arenas Belón" <carenas@gmail.com> Cc: git@vger.kernel.org, avarab@gmail.com, l.s.r@web.de Subject: Re: [PATCH v2] grep: avoid leak of chartables in PCRE2 Date: Fri, 02 Aug 2019 09:19:20 -0700 [thread overview] Message-ID: <xmqqwofvleuv.fsf@gitster-ct.c.googlers.com> (raw) In-Reply-To: <20190801170946.81221-1-carenas@gmail.com> ("Carlo Marcelo Arenas =?utf-8?Q?Bel=C3=B3n=22's?= message of "Thu, 1 Aug 2019 10:09:46 -0700") Carlo Marcelo Arenas Belón <carenas@gmail.com> writes: > 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. > > The table cleanup use free as there is no global context defined when > it was created (pcre2_maketables is passed a NULL pointer) but if that > gets ever changed will need to be updated in tandem. > > Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> > --- > V2: > * better document why free is used as suggested by René > * avoid reusing PCRE1 variable for easy of maintenance (per Ævar) Thanks; will queue. > > grep.c | 7 ++++--- > grep.h | 1 + > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/grep.c b/grep.c > index f7c3a5803e..fbd3f3757c 100644 > --- a/grep.c > +++ b/grep.c > @@ -488,7 +488,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; > @@ -499,9 +498,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(NULL); > + p->pcre2_tables = pcre2_maketables(NULL); > 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; > } > @@ -605,6 +605,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 1875880f37..26d21a3433 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;
next prev parent reply other threads:[~2019-08-02 16:19 UTC|newest] Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-27 20:27 [PATCH 0/3] grep: memory leak " Carlo Marcelo Arenas Belón 2019-07-27 20:27 ` [PATCH 1/3] grep: make pcre1_tables version agnostic Carlo Marcelo Arenas Belón 2019-07-27 23:47 ` Ævar Arnfjörð Bjarmason 2019-07-28 2:50 ` Carlo Arenas 2019-07-27 20:27 ` [PATCH 2/3] grep: use pcre_tables also for PCRE2 Carlo Marcelo Arenas Belón 2019-07-27 20:27 ` [PATCH 3/3] grep: plug leak of pcre chartables in PCRE2 Carlo Marcelo Arenas Belón 2019-07-27 23:48 ` Ævar Arnfjörð Bjarmason 2019-07-28 1:41 ` Carlo Arenas 2019-07-29 20:34 ` René Scharfe 2019-07-30 0:08 ` Carlo Arenas 2019-07-30 16:52 ` René Scharfe 2019-08-01 17:09 ` [PATCH v2] grep: avoid leak of " Carlo Marcelo Arenas Belón 2019-08-02 16:19 ` Junio C Hamano [this message] 2019-08-03 18:50 ` Carlo Arenas 2019-08-05 19:34 ` Junio C Hamano
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=xmqqwofvleuv.fsf@gitster-ct.c.googlers.com \ --to=gitster@pobox.com \ --cc=avarab@gmail.com \ --cc=carenas@gmail.com \ --cc=git@vger.kernel.org \ --cc=l.s.r@web.de \ --subject='Re: [PATCH v2] grep: avoid leak of chartables in PCRE2' \ /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
Code repositories for project(s) associated with this 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).