Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3:
  Fix is_zend_ptr() huge block comparison
This commit is contained in:
Niels Dossche 2024-11-26 19:24:47 +01:00
commit 8fdcd9f051
No known key found for this signature in database
GPG key ID: B8A8AD166DF0E2E5
2 changed files with 3 additions and 2 deletions

View file

@ -2617,8 +2617,8 @@ ZEND_API bool is_zend_ptr(const void *ptr)
zend_mm_huge_list *block = AG(mm_heap)->huge_list;
while (block) {
if (ptr >= (void*)block
&& ptr < (void*)((char*)block + block->size)) {
if (ptr >= block->ptr
&& ptr < (void*)((char*)block->ptr + block->size)) {
return 1;
}
block = block->next;