Skip to content

Commit 98fc95f

Browse files
committed
Fix memory leak in zend_abstract_interface/hook/hook.c
1 parent 1b58d34 commit 98fc95f

2 files changed

Lines changed: 4 additions & 12 deletions

File tree

loader/valgrind.supp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
{
2-
<leak from zai interceptor>
3-
Memcheck:Leak
4-
match-leak-kinds: possible
5-
...
6-
fun:zai_hook_register_inheritor
7-
fun:zai_hook_register_all_inheritors
8-
fun:zai_hook_post_startup
9-
fun:zai_interceptor_post_startup
10-
...
11-
}
121
{
132
<insert_a_suppression_name_here>
143
Memcheck:Leak

zend_abstract_interface/hook/hook.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1226,7 +1226,10 @@ void zai_hook_rshutdown(void) {
12261226

12271227
void zai_hook_gshutdown(void) { free(zai_hook_tls); }
12281228

1229-
void zai_hook_mshutdown(void) { zend_hash_destroy(&zai_hook_static); } /* }}} */
1229+
void zai_hook_mshutdown(void) {
1230+
zend_hash_destroy(&zai_hook_static);
1231+
zend_hash_destroy(&zai_hook_static_inheritors);
1232+
} /* }}} */
12301233

12311234
/* {{{ */
12321235
zend_long zai_hook_install_resolved_generator(zend_function *function,

0 commit comments

Comments
 (0)