Skip to content

Commit 7841c8a

Browse files
committed
Merge branch 'PHP-8.1' into PHP-8.2
* PHP-8.1: Track heap->real_size for USE_TRACKED_ALLOC
2 parents 25d21f4 + 9cacc57 commit 7841c8a

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

Zend/zend_alloc.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2276,6 +2276,7 @@ void zend_mm_shutdown(zend_mm_heap *heap, bool full, bool silent)
22762276
heap->custom_heap.std._free = free;
22772277
}
22782278
heap->size = 0;
2279+
heap->real_size = 0;
22792280
}
22802281

22812282
if (full) {
@@ -2836,6 +2837,7 @@ static void *tracked_malloc(size_t size)
28362837

28372838
tracked_add(heap, ptr, size);
28382839
heap->size += size;
2840+
heap->real_size = heap->size;
28392841
return ptr;
28402842
}
28412843

@@ -2847,6 +2849,7 @@ static void tracked_free(void *ptr) {
28472849
zend_mm_heap *heap = AG(mm_heap);
28482850
zval *size_zv = tracked_get_size_zv(heap, ptr);
28492851
heap->size -= Z_LVAL_P(size_zv);
2852+
heap->real_size = heap->size;
28502853
zend_hash_del_bucket(heap->tracked_allocs, (Bucket *) size_zv);
28512854
free(ptr);
28522855
}
@@ -2872,6 +2875,7 @@ static void *tracked_realloc(void *ptr, size_t new_size) {
28722875
ptr = __zend_realloc(ptr, new_size);
28732876
tracked_add(heap, ptr, new_size);
28742877
heap->size += new_size - old_size;
2878+
heap->real_size = heap->size;
28752879
return ptr;
28762880
}
28772881

0 commit comments

Comments
 (0)