From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 4 Jul 2019 10:07:47 +0000 (+0300)
Subject: Split destructor
X-Git-Tag: php-7.4.0alpha3~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3d35b64343e0619823bfa2fe104291a00ea7954;p=php

Split destructor
---

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 66090f121a..cae276134c 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -143,7 +143,16 @@ static void php_free_pcre_cache(zval *data) /* {{{ */
 	pcre_cache_entry *pce = (pcre_cache_entry *) Z_PTR_P(data);
 	if (!pce) return;
 	pcre2_code_free(pce->re);
-	pefree(pce, !PCRE_G(per_request_cache));
+	free(pce);
+}
+/* }}} */
+
+static void php_efree_pcre_cache(zval *data) /* {{{ */
+{
+	pcre_cache_entry *pce = (pcre_cache_entry *) Z_PTR_P(data);
+	if (!pce) return;
+	pcre2_code_free(pce->re);
+	efree(pce);
 }
 /* }}} */
 
@@ -459,7 +468,7 @@ static PHP_RINIT_FUNCTION(pcre)
 #endif
 
 	if (PCRE_G(per_request_cache)) {
-		zend_hash_init(&PCRE_G(pcre_cache), 0, NULL, php_free_pcre_cache, 0);
+		zend_hash_init(&PCRE_G(pcre_cache), 0, NULL, php_efree_pcre_cache, 0);
 	}
 
 	return SUCCESS;