Skip to content

Commit 10da030

Browse files
carenasgitster
authored andcommitted
grep: avoid leak of chartables in PCRE2
94da919 ("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 <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 513f2b0 commit 10da030

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

grep.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,6 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
525525
PCRE2_UCHAR errbuf[256];
526526
PCRE2_SIZE erroffset;
527527
int options = PCRE2_MULTILINE;
528-
const uint8_t *character_tables = NULL;
529528
int jitret;
530529
int patinforet;
531530
size_t jitsizearg;
@@ -539,9 +538,10 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
539538
if (has_non_ascii(p->pattern)) {
540539
if (!pcre2_global_context)
541540
BUG("pcre2_global_context uninitialized");
542-
character_tables = pcre2_maketables(pcre2_global_context);
541+
p->pcre2_tables = pcre2_maketables(pcre2_global_context);
543542
p->pcre2_compile_context = pcre2_compile_context_create(NULL);
544-
pcre2_set_character_tables(p->pcre2_compile_context, character_tables);
543+
pcre2_set_character_tables(p->pcre2_compile_context,
544+
p->pcre2_tables);
545545
}
546546
options |= PCRE2_CASELESS;
547547
}
@@ -645,6 +645,7 @@ static void free_pcre2_pattern(struct grep_pat *p)
645645
pcre2_match_data_free(p->pcre2_match_data);
646646
pcre2_jit_stack_free(p->pcre2_jit_stack);
647647
pcre2_match_context_free(p->pcre2_match_context);
648+
free((void *)p->pcre2_tables);
648649
}
649650
#else /* !USE_LIBPCRE2 */
650651
static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt)

grep.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ struct grep_pat {
9696
pcre2_compile_context *pcre2_compile_context;
9797
pcre2_match_context *pcre2_match_context;
9898
pcre2_jit_stack *pcre2_jit_stack;
99+
const uint8_t *pcre2_tables;
99100
uint32_t pcre2_jit_on;
100101
kwset_t kws;
101102
unsigned fixed:1;

0 commit comments

Comments
 (0)