Fixed incorrect tracked malloc deallocation

dstogov · dstogov · commit 4553258df3f4 · 2023-08-01T16:01:11.000+03:00
Fixes ext/ffi/tests/list.phpt failure
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
@@ -2412,6 +2412,13 @@ ZEND_API bool is_zend_ptr(const void *ptr)
 {
 #if ZEND_MM_CUSTOM
 	if (AG(mm_heap)->use_custom_heap) {
+		if (AG(mm_heap)->custom_heap.std._malloc == tracked_malloc) {
+			zend_ulong h = ((uintptr_t) ptr) >> ZEND_MM_ALIGNMENT_LOG2;
+			zval *size_zv = zend_hash_index_find(AG(mm_heap)->tracked_allocs, h);
+			if  (size_zv) {
+				return 1;
+			}
+		}
 		return 0;
 	}
 #endif

Original file line number	Diff line number	Diff line change
`@@ -2412,6 +2412,13 @@ ZEND_API bool is_zend_ptr(const void *ptr)`
`2412`	`2412`	`{`
`2413`	`2413`	`#if ZEND_MM_CUSTOM`
`2414`	`2414`	`if (AG(mm_heap)->use_custom_heap) {`
	`2415`	`+ if (AG(mm_heap)->custom_heap.std._malloc == tracked_malloc) {`
	`2416`	`+ zend_ulong h = ((uintptr_t) ptr) >> ZEND_MM_ALIGNMENT_LOG2;`
	`2417`	`+ zval *size_zv = zend_hash_index_find(AG(mm_heap)->tracked_allocs, h);`
	`2418`	`+ if (size_zv) {`
	`2419`	`+ return 1;`
	`2420`	`+ }`
	`2421`	`+ }`
`2415`	`2422`	`return 0;`
`2416`	`2423`	`}`
`2417`	`2424`	`#endif`