walkero
/
pcre2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix memory leak in pcre2grep.

This commit is contained in:
Philip.Hazel 2015-06-30 10:28:59 +00:00
parent c5f27e1c18
commit 3fc1676b26
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,7 +1,7 @@
Change Log for PCRE2
--------------------
Version 10.20 16-June-2015
Version 10.20 30-June-2015
--------------------------
1. Callouts with string arguments have been added.
@ -180,6 +180,8 @@ within a class.
47. JIT should return with error when the compiled pattern requires
more stack space than the maximum.
48. Fixed a memory leak in pcre2grep when a locale is set.
Version 10.10 06-March-2015
---------------------------

10
src/pcre2grep.c
View File

@ -171,6 +171,8 @@ static BOOL use_jit = TRUE;
static BOOL use_jit = FALSE;
#endif
static const uint8_t *character_tables = NULL;
static uint32_t pcre2_options = 0;
static uint32_t process_options = 0;
static uint32_t match_limit = 0;
@ -2984,7 +2986,8 @@ if (locale == NULL)
locale_from = "LC_CTYPE";
}
/* If a locale is set, use it to generate the tables the PCRE needs. */
/* If a locale is set, use it to generate the tables the PCRE needs. Passing
NULL to pcre2_maketables() means that malloc() is used to get the memory. */
if (locale != NULL)
{
@ -2994,7 +2997,8 @@ if (locale != NULL)
locale, locale_from);
goto EXIT2;
}
pcre2_set_character_tables(compile_context, pcre2_maketables(NULL));
character_tables = pcre2_maketables(NULL);
pcre2_set_character_tables(compile_context, character_tables);
}
/* Sort out colouring */
@ -3232,6 +3236,8 @@ if (jit_stack != NULL) pcre2_jit_stack_free(jit_stack);
#endif
free(main_buffer);
free((void *)character_tables);
pcre2_compile_context_free(compile_context);
pcre2_match_context_free(match_context);
pcre2_match_data_free(match_data);