Merge branch 'PHP-8.4'

* PHP-8.4:
  Fix 'phpdbg --help' segfault on shutdown with USE_ZEND_ALLOC=0
This commit is contained in:
Niels Dossche 2025-06-10 19:23:03 +02:00
commit 7f3a2bc727
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5

View file

@ -180,12 +180,6 @@ static PHP_MSHUTDOWN_FUNCTION(phpdbg) /* {{{ */
phpdbg_notice("Script ended normally");
}
/* hack to restore mm_heap->use_custom_heap in order to receive memory leak info */
if (use_mm_wrappers) {
/* ASSUMING that mm_heap->use_custom_heap is the first element of the struct ... */
*(int *) zend_mm_get_heap() = 0;
}
if (PHPDBG_G(buffer)) {
free(PHPDBG_G(buffer));
PHPDBG_G(buffer) = NULL;