remove is_zend_mm() check

Author: realFlowControl

Zend/zend_alloc.c

@@ -2420,7 +2420,7 @@ void* ZEND_FASTCALL _zend_mm_realloc2(zend_mm_heap *heap, void *ptr, size_t size
 ZEND_API size_t ZEND_FASTCALL _zend_mm_block_size(zend_mm_heap *heap, void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 {
 #if ZEND_MM_CUSTOM
-	if (UNEXPECTED(heap->use_custom_heap)) {
+	if (UNEXPECTED(heap->use_custom_heap & ~ZEND_MM_CUSTOM_HEAP_OBSERVED)) {
 		if (heap->custom_heap.std._malloc == tracked_malloc) {
 			zend_ulong h = ((uintptr_t) ptr) >> ZEND_MM_ALIGNMENT_LOG2;
 			zval *size_zv = zend_hash_index_find(heap->tracked_allocs, h);

ext/zend_test/zend_mm_observer.c

@@ -24,7 +24,7 @@
 static void zend_mm_test_observer_malloc(size_t len, void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 {
 	size_t block_len = 0;
-	if (is_zend_mm() && is_zend_ptr(ptr)) {
+	if (is_zend_ptr(ptr)) {
 		block_len = zend_mm_block_size(zend_mm_get_heap(), ptr);
 	}
 	printf("malloc %p of size %zu (block: %zu)\n", ptr, len, block_len);
@@ -34,7 +34,7 @@ static void zend_mm_test_observer_malloc(size_t len, void *ptr ZEND_FILE_LINE_DC
 static void zend_mm_test_observer_free(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 {
 	size_t block_len = 0;
-	if (is_zend_mm() && is_zend_ptr(ptr)) {
+	if (is_zend_ptr(ptr)) {
 		block_len = zend_mm_block_size(zend_mm_get_heap(), ptr);
 	}
 	printf("freed %p of size %zu\n", ptr, block_len);
@@ -44,7 +44,7 @@ static void zend_mm_test_observer_free(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LIN
 static void zend_mm_test_observer_realloc(void *ptr, size_t len, void *newptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 {
 	size_t block_len = 0;
-	if (is_zend_mm() && is_zend_ptr(ptr)) {
+	if (is_zend_ptr(ptr)) {
 		block_len = zend_mm_block_size(zend_mm_get_heap(), ptr);
 	}
 	printf("realloc %p of size %zu (block: %zu, former %p)\n", newptr, len, block_len, ptr);