Skip to content

Commit dfc4caa

Browse files
committed
Merge branch 'PHP-8.2' into PHP-8.3
* PHP-8.2: Track heap->real_size for USE_TRACKED_ALLOC
2 parents 5cf3c26 + 7841c8a commit dfc4caa

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
}
22772277
#if ZEND_MM_STAT
22782278
heap->size = 0;
2279+
heap->real_size = 0;
22792280
#endif
22802281
}
22812282

@@ -2850,6 +2851,7 @@ static void *tracked_malloc(size_t size)
28502851
tracked_add(heap, ptr, size);
28512852
#if ZEND_MM_STAT
28522853
heap->size += size;
2854+
heap->real_size = heap->size;
28532855
#endif
28542856
return ptr;
28552857
}
@@ -2863,6 +2865,7 @@ static void tracked_free(void *ptr) {
28632865
zval *size_zv = tracked_get_size_zv(heap, ptr);
28642866
#if ZEND_MM_STAT
28652867
heap->size -= Z_LVAL_P(size_zv);
2868+
heap->real_size = heap->size;
28662869
#endif
28672870
zend_hash_del_bucket(heap->tracked_allocs, (Bucket *) size_zv);
28682871
free(ptr);
@@ -2890,6 +2893,7 @@ static void *tracked_realloc(void *ptr, size_t new_size) {
28902893
tracked_add(heap, ptr, new_size);
28912894
#if ZEND_MM_STAT
28922895
heap->size += new_size - old_size;
2896+
heap->real_size = heap->size;
28932897
#endif
28942898
return ptr;
28952899
}

0 commit comments

Comments
 (0)