Commit 6f78ef8

committed

remove is_zend_mm() check

1 parent 125727a commit 6f78ef8Copy full SHA for 6f78ef8

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2411,7 +2411,7 @@ void* ZEND_FASTCALL _zend_mm_realloc2(zend_mm_heap heap, void ptr, size_t size`
`2411`	`2411`	`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)`
`2412`	`2412`	`{`
`2413`	`2413`	`#if ZEND_MM_CUSTOM`
`2414`		`- if (UNEXPECTED(heap->use_custom_heap)) {`
	`2414`	`+ if (UNEXPECTED(heap->use_custom_heap& ~ZEND_MM_CUSTOM_HEAP_OBSERVED)) {`
`2415`	`2415`	`if (heap->custom_heap.std._malloc == tracked_malloc) {`
`2416`	`2416`	`zend_ulong h = ((uintptr_t) ptr) >> ZEND_MM_ALIGNMENT_LOG2;`
`2417`	`2417`	`zval *size_zv = zend_hash_index_find(heap->tracked_allocs, h);`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`static void zend_mm_test_observer_malloc(size_t len, void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)`
`25`	`25`	`{`
`26`	`26`	`size_t block_len = 0;`
`27`		`- if (is_zend_mm() &&is_zend_ptr(ptr)) {`
	`27`	`+ if (is_zend_ptr(ptr)) {`
`28`	`28`	`block_len = zend_mm_block_size(zend_mm_get_heap(), ptr);`
`29`	`29`	`}`
`30`	`30`	`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`
`34`	`34`	`static void zend_mm_test_observer_free(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)`
`35`	`35`	`{`
`36`	`36`	`size_t block_len = 0;`
`37`		`- if (is_zend_mm() &&is_zend_ptr(ptr)) {`
	`37`	`+ if (is_zend_ptr(ptr)) {`
`38`	`38`	`block_len = zend_mm_block_size(zend_mm_get_heap(), ptr);`
`39`	`39`	`}`
`40`	`40`	`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`
`44`	`44`	`static void zend_mm_test_observer_realloc(void ptr, size_t len, void newptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)`
`45`	`45`	`{`
`46`	`46`	`size_t block_len = 0;`
`47`		`- if (is_zend_mm() &&is_zend_ptr(ptr)) {`
	`47`	`+ if (is_zend_ptr(ptr)) {`
`48`	`48`	`block_len = zend_mm_block_size(zend_mm_get_heap(), ptr);`
`49`	`49`	`}`
`50`	`50`	`printf("realloc %p of size %zu (block: %zu, former %p)\n", newptr, len, block_len, ptr);`

Comments

(0)