Bump

danog · danog · commit 303dfa485295 · 2025-06-11T14:35:43.000+02:00
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
@@ -2760,11 +2760,8 @@ ZEND_API size_t ZEND_FASTCALL _zend_mm_block_size(zend_mm_heap *heap, void *ptr
 		} else if (heap->custom_heap._malloc != poison_malloc) {
 			return 0;
 		}
-<<<<<<< HEAD
 		ZEND_MM_POISON_HEAP(heap);
 		return 0;
-=======
->>>>>>> origin/master
 	}
 #endif
 	size_t ret = zend_mm_size(heap, ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);

Original file line number	Diff line number	Diff line change
`@@ -2760,11 +2760,8 @@ ZEND_API size_t ZEND_FASTCALL _zend_mm_block_size(zend_mm_heap heap, void ptr`
`2760`	`2760`	`} else if (heap->custom_heap._malloc != poison_malloc) {`
`2761`	`2761`	`return 0;`
`2762`	`2762`	`}`
`2763`		`-<<<<<<< HEAD`
`2764`	`2763`	`ZEND_MM_POISON_HEAP(heap);`
`2765`	`2764`	`return 0;`
`2766`		`-=======`
`2767`		`->>>>>>> origin/master`
`2768`	`2765`	`}`
`2769`	`2766`	`#endif`
`2770`	`2767`	`size_t ret = zend_mm_size(heap, ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);`