Cleanup

Author: danog

Zend/zend_alloc.c

@@ -3438,7 +3438,7 @@ static zend_always_inline void tracked_check_limit(zend_mm_heap *heap, size_t ad
 static void *tracked_malloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
 {
 	zend_mm_heap *heap = AG(mm_heap);
-	ZEND_MM_UNPOISON_HEAP(heap);
+	// Assume it is already unpoisoned
 	tracked_check_limit(heap, size);
 
 	void *ptr = malloc(size);
@@ -3450,7 +3450,6 @@ static void *tracked_malloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC
 #if ZEND_MM_STAT
 	heap->size += size;
 #endif
-	ZEND_MM_POISON_HEAP(heap);
 	return ptr;
 }
 
@@ -3460,19 +3459,16 @@ static void tracked_free(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) {
 	}
 
 	zend_mm_heap *heap = AG(mm_heap);
-	ZEND_MM_UNPOISON_HEAP(heap);
 	zval *size_zv = tracked_get_size_zv(heap, ptr);
 #if ZEND_MM_STAT
 	heap->size -= Z_LVAL_P(size_zv);
 #endif
 	zend_hash_del_bucket(heap->tracked_allocs, (Bucket *) size_zv);
-	ZEND_MM_POISON_HEAP(heap);
 	free(ptr);
 }
 
 static void *tracked_realloc(void *ptr, size_t new_size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) {
 	zend_mm_heap *heap = AG(mm_heap);
-	ZEND_MM_UNPOISON_HEAP(heap);
 	zval *old_size_zv = NULL;
 	size_t old_size = 0;
 	if (ptr) {
@@ -3494,7 +3490,6 @@ static void *tracked_realloc(void *ptr, size_t new_size ZEND_FILE_LINE_DC ZEND_F
 #if ZEND_MM_STAT
 	heap->size += new_size - old_size;
 #endif
-	ZEND_MM_POISON_HEAP(heap);
 	return ptr;
 }