Skip to content

Commit 7f3a2bc

Browse files
committed
Merge branch 'PHP-8.4'
* PHP-8.4: Fix 'phpdbg --help' segfault on shutdown with USE_ZEND_ALLOC=0
2 parents 5740607 + 6685414 commit 7f3a2bc

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

sapi/phpdbg/phpdbg.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,12 +180,6 @@ static PHP_MSHUTDOWN_FUNCTION(phpdbg) /* {{{ */
180180
phpdbg_notice("Script ended normally");
181181
}
182182

183-
/* hack to restore mm_heap->use_custom_heap in order to receive memory leak info */
184-
if (use_mm_wrappers) {
185-
/* ASSUMING that mm_heap->use_custom_heap is the first element of the struct ... */
186-
*(int *) zend_mm_get_heap() = 0;
187-
}
188-
189183
if (PHPDBG_G(buffer)) {
190184
free(PHPDBG_G(buffer));
191185
PHPDBG_G(buffer) = NULL;

0 commit comments

Comments
 (0)