mirror/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2024-09-28 06:49:49 +02:00
Code

Fix overlapping commits

Browse Source
This commit is contained in:
Barton E. Schaefer 2018-01-21 09:46:31 -08:00
commit 4c8552170e
2 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2018-01-20 Mikael Magnusson <mikachu@gmail.com>
* 42243: Src/Modules/pcre.c: Free stuff properly in zsh/pcre
module
2018-01-19 Barton E. Schaefer <schaefer@zsh.org>
* dana: 41924: Doc/Zsh/params.yo: (wi) subscript flag interaction

35
Src/Modules/pcre.c
View File

@ -88,10 +88,19 @@ bin_pcre_compile(char *nam, char **args, Options ops, UNUSED(int func))
if (zpcre_utf8_enabled())
pcre_opts |= PCRE_UTF8;
pcre_hints = NULL; /* Is this necessary? */
#ifdef HAVE_PCRE_STUDY
if (pcre_hints)
#ifdef PCRE_CONFIG_JIT
pcre_free_study(pcre_hints);
#else
pcre_free(pcre_hints);
#endif
pcre_hints = NULL;
#endif
if (pcre_pattern)
pcre_free(pcre_pattern);
pcre_pattern = NULL;
target = ztrdup(*args);
unmetafy(target, &target_len);
@ -128,6 +137,14 @@ bin_pcre_study(char *nam, UNUSED(char **args), UNUSED(Options ops), UNUSED(int f
return 1;
}
if (pcre_hints)
#ifdef PCRE_CONFIG_JIT
pcre_free_study(pcre_hints);
#else
pcre_free(pcre_hints);
#endif
pcre_hints = NULL;
pcre_hints = pcre_study(pcre_pattern, 0, &pcre_error);
if (pcre_error != NULL)
{
@ -528,5 +545,21 @@ cleanup_(Module m)
int
finish_(UNUSED(Module m))
{
#if defined(HAVE_PCRE_COMPILE) && defined(HAVE_PCRE_EXEC)
#ifdef HAVE_PCRE_STUDY
if (pcre_hints)
#ifdef PCRE_CONFIG_JIT
pcre_free_study(pcre_hints);
#else
pcre_free(pcre_hints);
#endif
pcre_hints = NULL;
#endif
if (pcre_pattern)
pcre_free(pcre_pattern);
pcre_pattern = NULL;
#endif
return 0;
}