php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

zend_alloc: Fix compilation with ZEND_MM_CUSTOM=0 (#18808)

Browse Source 
The poison feature relies on ZEND_MM_CUSTOM=1.
If ZEND_MM_CUSTOM=0, the build fails.
To fix this, move some `#endif`.
This commit is contained in:
Niels Dossche
2025-06-09 12:44:41 +02:00
committed by GitHub
parent b41a8aaffd
commit 7b6c0b99bb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Zend/zend_alloc.c
View File

@@ -2400,7 +2400,6 @@ static void zend_mm_check_leaks(zend_mm_heap *heap)
static void *tracked_malloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
static void tracked_free_all(zend_mm_heap *heap);
static void *poison_malloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
#endif
static void zend_mm_check_freelists(zend_mm_heap *heap)
{
@@ -2411,6 +2410,7 @@ static void zend_mm_check_freelists(zend_mm_heap *heap)
}
}
}
#endif
ZEND_API void zend_mm_shutdown(zend_mm_heap *heap, bool full, bool silent)
{
@@ -3041,7 +3041,6 @@ static void tracked_free_all(zend_mm_heap *heap) {
free(ptr);
} ZEND_HASH_FOREACH_END();
}
#endif
static void* poison_malloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
{
@@ -3236,6 +3235,7 @@ static void poison_enable(zend_mm_heap *heap, char *parameters)
zend_mm_set_custom_handlers_ex(heap, poison_malloc, poison_free,
poison_realloc, poison_gc, poison_shutdown);
}
#endif
static void alloc_globals_ctor(zend_alloc_globals *alloc_globals)
{