Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
18674e3
Fix is_zend_ptr() huge block comparison
ndossche Nov 25, 2024
02b1056
Merge branch 'PHP-8.2' into PHP-8.3
ndossche Nov 26, 2024
8fdcd9f
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Nov 26, 2024
cef23c4
Merge branch 'PHP-8.4'
ndossche Nov 26, 2024
de30ba5
Fix GH-16879: JIT dead code skipping does not update call_level
ndossche Nov 25, 2024
b3db7f7
Merge branch 'PHP-8.4'
ndossche Nov 26, 2024
d31de85
Avoid possible spill conflict (one of the problem that caused GH-1682…
dstogov Nov 26, 2024
be27cbd
Merge branch 'PHP-8.4'
dstogov Nov 26, 2024
a80f0b5
Fix various memory leaks in curl mime handling
ndossche Nov 10, 2024
8906021
Merge branch 'PHP-8.2' into PHP-8.3
ndossche Nov 26, 2024
8206de6
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Nov 26, 2024
4591f04
Merge branch 'PHP-8.4'
ndossche Nov 26, 2024
ed55693
Extract call_level conditions out to separate functions (#16949)
ndossche Nov 26, 2024
30ec2de
Merge branch 'PHP-8.4'
ndossche Nov 26, 2024
ae84b81
Backport GH-14962 to stable versions
orlitzky Jul 15, 2024
21df4a9
Merge branch 'PHP-8.2' into PHP-8.3
ndossche Nov 26, 2024
0d8c5ad
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Nov 26, 2024
408f5f8
Merge branch 'PHP-8.4'
ndossche Nov 26, 2024
97b0318
Fix GH-15208: Segfault with breakpoint map and phpdbg_clear()
ndossche Nov 26, 2024
3c3ec0e
Merge branch 'PHP-8.2' into PHP-8.3
ndossche Nov 26, 2024
5ff67f8
Merge branch 'PHP-8.3' into PHP-8.4
ndossche Nov 26, 2024
c2a6a7d
Merge branch 'PHP-8.4'
ndossche Nov 26, 2024
b89d7ff
Fix GH-16821: runtime error: member access within misaligned address …
dstogov Nov 26, 2024
2de0d8e
Merge branch 'PHP-8.4'
dstogov Nov 26, 2024
56fb910
Fix the 1st parameter type casing of pg_set_chunked_rows_size()
kocsismate Nov 26, 2024
17187c4
Merge branch 'PHP-8.4'
kocsismate Nov 26, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Zend/zend_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading