Skip to content

Commit e3d35b6

Browse files
committed
Split destructor
1 parent df243f1 commit e3d35b6

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

ext/pcre/php_pcre.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,16 @@ static void php_free_pcre_cache(zval *data) /* {{{ */
143143
pcre_cache_entry *pce = (pcre_cache_entry *) Z_PTR_P(data);
144144
if (!pce) return;
145145
pcre2_code_free(pce->re);
146-
pefree(pce, !PCRE_G(per_request_cache));
146+
free(pce);
147+
}
148+
/* }}} */
149+
150+
static void php_efree_pcre_cache(zval *data) /* {{{ */
151+
{
152+
pcre_cache_entry *pce = (pcre_cache_entry *) Z_PTR_P(data);
153+
if (!pce) return;
154+
pcre2_code_free(pce->re);
155+
efree(pce);
147156
}
148157
/* }}} */
149158

@@ -459,7 +468,7 @@ static PHP_RINIT_FUNCTION(pcre)
459468
#endif
460469

461470
if (PCRE_G(per_request_cache)) {
462-
zend_hash_init(&PCRE_G(pcre_cache), 0, NULL, php_free_pcre_cache, 0);
471+
zend_hash_init(&PCRE_G(pcre_cache), 0, NULL, php_efree_pcre_cache, 0);
463472
}
464473

465474
return SUCCESS;

0 commit comments

Comments
 (0)