Skip to content

[pull] master from php:master #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 21, 2020
Merged

[pull] master from php:master #15

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
afe1423
SplHeap: Avoid memcpy on overlapping pointer
weltling Jun 21, 2020
56aebbe
Merge branch 'PHP-7.4'
weltling Jun 21, 2020
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
6 changes: 5 additions & 1 deletion ext/spl/spl_heap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ static zend_always_inline void *spl_heap_elem(spl_ptr_heap *heap, size_t i) {
}

static zend_always_inline void spl_heap_elem_copy(spl_ptr_heap *heap, void *to, void *from) {
assert(to != from);
memcpy(to, from, heap->elem_size);
}

Expand Down Expand Up @@ -325,7 +326,10 @@ static int spl_ptr_heap_delete_top(spl_ptr_heap *heap, void *elem, void *cmp_use
heap->flags |= SPL_HEAP_CORRUPTED;
}

spl_heap_elem_copy(heap, spl_heap_elem(heap, i), bottom);
void *to = spl_heap_elem(heap, i);
if (to != bottom) {
spl_heap_elem_copy(heap, to, bottom);
}
return SUCCESS;
}
/* }}} */
Expand Down