From 5c656716ff3932953efd2a225c8d60b609058cf6 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@gmail.com>
Date: Sun, 7 Jan 2018 13:17:36 +0100
Subject: 42243: Free stuff properly in zsh/pcre module

---
 Src/Modules/pcre.c | 35 ++++++++++++++++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

(limited to 'Src')

diff --git a/Src/Modules/pcre.c b/Src/Modules/pcre.c
index 659fd22d5..15ee34bc8 100644
--- a/Src/Modules/pcre.c
+++ b/Src/Modules/pcre.c
@@ -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;
 }
-- 
cgit 1.4.1