Merge branch 'PHP-8.1' into PHP-8.2

dstogov · dstogov · commit 5abf4f232ecb · 2023-08-01T16:01:57.000+03:00
* PHP-8.1:
  Fixed incorrect tracked malloc deallocation
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
@@ -2432,6 +2432,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
`@@ -2432,6 +2432,13 @@ ZEND_API bool is_zend_ptr(const void *ptr)`
`2432`	`2432`	`{`
`2433`	`2433`	`#if ZEND_MM_CUSTOM`
`2434`	`2434`	`if (AG(mm_heap)->use_custom_heap) {`
	`2435`	`+ if (AG(mm_heap)->custom_heap.std._malloc == tracked_malloc) {`
	`2436`	`+ zend_ulong h = ((uintptr_t) ptr) >> ZEND_MM_ALIGNMENT_LOG2;`
	`2437`	`+ zval *size_zv = zend_hash_index_find(AG(mm_heap)->tracked_allocs, h);`
	`2438`	`+ if (size_zv) {`
	`2439`	`+ return 1;`
	`2440`	`+ }`
	`2441`	`+ }`
`2435`	`2442`	`return 0;`
`2436`	`2443`	`}`
`2437`	`2444`	`#endif`