Test

danog · danog · commit 0d0886f22a40 · 2025-06-16T13:59:25.000+02:00
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
@@ -514,6 +514,7 @@ static void stderr_last_error(char *msg)
 
 static void zend_mm_munmap(void *addr, size_t size)
 {
+	ZEND_MM_UNPOISON(addr, size);
 #ifdef _WIN32
 	if (VirtualFree(addr, 0, MEM_RELEASE) == 0) {
 		/** ERROR_INVALID_ADDRESS is expected when addr is not range start address */
@@ -886,7 +887,6 @@ static void zend_mm_chunk_free(zend_mm_heap *heap, void *addr, size_t size)
 		return;
 	}
 #endif
-	ZEND_MM_UNPOISON(addr, size);
 	zend_mm_munmap(addr, size);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -514,6 +514,7 @@ static void stderr_last_error(char *msg)`
`514`	`514`
`515`	`515`	`static void zend_mm_munmap(void *addr, size_t size)`
`516`	`516`	`{`
	`517`	`+ ZEND_MM_UNPOISON(addr, size);`
`517`	`518`	`#ifdef _WIN32`
`518`	`519`	`if (VirtualFree(addr, 0, MEM_RELEASE) == 0) {`
`519`	`520`	`/** ERROR_INVALID_ADDRESS is expected when addr is not range start address */`
`@@ -886,7 +887,6 @@ static void zend_mm_chunk_free(zend_mm_heap heap, void addr, size_t size)`
`886`	`887`	`return;`
`887`	`888`	`}`
`888`	`889`	`#endif`
`889`		`- ZEND_MM_UNPOISON(addr, size);`
`890`	`890`	`zend_mm_munmap(addr, size);`
`891`	`891`	`}`
`892`	`892`