deduplicate observer calling

Author: realFlowControl

Zend/zend_alloc.c

@@ -2503,6 +2503,17 @@ ZEND_API bool is_zend_ptr(const void *ptr)
 
 #if ZEND_MM_CUSTOM
 
+#define HANDLE_OBSERVERS(observer_function, ...) \
+    if (use_custom_heap & ZEND_MM_CUSTOM_HEAP_OBSERVED) { \
+        zend_mm_observer *current = heap->observers; \
+        while (current != NULL) { \
+            if (current->observer_function != NULL) { \
+                current->observer_function(__VA_ARGS__ ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); \
+            } \
+            current = current->next; \
+        } \
+    }
+
 static ZEND_COLD void* ZEND_FASTCALL _malloc_custom(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 {
 	void *ptr;
@@ -2516,15 +2527,7 @@ static ZEND_COLD void* ZEND_FASTCALL _malloc_custom(size_t size ZEND_FILE_LINE_D
 		// no custom memory manager, only observer present
 		ptr = zend_mm_alloc_heap(AG(mm_heap), size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 	}
-	if (use_custom_heap & ZEND_MM_CUSTOM_HEAP_OBSERVED) {
-		zend_mm_observer *current = heap->observers;
-		while (current != NULL) {
-			if (current->malloc != NULL) {
-				current->malloc(size, ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
-			}
-			current = current->next;
-		}
-	}
+	HANDLE_OBSERVERS(malloc, size, ptr)
 	return ptr;
 }
 
@@ -2533,15 +2536,7 @@ static ZEND_COLD void ZEND_FASTCALL _efree_custom(void *ptr ZEND_FILE_LINE_DC ZE
 	zend_mm_heap *heap = AG(mm_heap);
 	int use_custom_heap = heap->use_custom_heap;
 
-	if (use_custom_heap & ZEND_MM_CUSTOM_HEAP_OBSERVED) {
-		zend_mm_observer *current = heap->observers;
-		while (current != NULL) {
-			if (current->free != NULL) {
-				current->free(ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
-			}
-			current = current->next;
-		}
-	}
+	HANDLE_OBSERVERS(free, ptr)
 
 	if (ZEND_DEBUG && use_custom_heap & ZEND_MM_CUSTOM_HEAP_DEBUG) {
 		heap->custom_heap.debug._free(ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
@@ -2566,15 +2561,7 @@ static ZEND_COLD void* ZEND_FASTCALL _realloc_custom(void *ptr, size_t size ZEND
 		// no custom memory manager, only observer present
 		new_ptr = zend_mm_realloc_heap(AG(mm_heap), ptr, size, 0, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 	}
-	if (use_custom_heap & ZEND_MM_CUSTOM_HEAP_OBSERVED) {
-		zend_mm_observer *current = heap->observers;
-		while (current != NULL) {
-			if (current->realloc != NULL) {
-				current->realloc(ptr, size, new_ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
-			}
-			current = current->next;
-		}
-	}
+	HANDLE_OBSERVERS(realloc, ptr, size, new_ptr)
 	return new_ptr;
 }
 #endif