[pull] master from php:master#102
Merged
Merged
Conversation
There are 2 issues: 1. When a MULTISORT_ABORT happens, it frees func, but func may point to ARRAYG(multisort_func), which would be a problem with nested invocations as it can destroy that of the "parent" invocation. To solve this, delay assigning to the globals. 2. The old globals were not restored which means that nested invocations with different flags will cause a wrong sorting function to be used. Closes GH-19319.
* PHP-8.3: Fix GH-19300: Nested array_multisort invocation with error breaks
* PHP-8.4: Fix GH-19300: Nested array_multisort invocation with error breaks
Otherwise this hits an assertion failure in pass2 reversal and causes a subsequent crash. Closes GH-19206.
* PHP-8.4: Remove dynamic defs from property hooks Add missing hooks JIT restart code
…9331) Fix use sites at the same time
And move some into their relevant folders
* PHP-8.4: Fix stale nInternalPosition on rehashing
Reuse the helper zend_foreach_op_array() that we move to the zend_optimizer.h header to be usable in opcache. Note that applying this to other op_array loops is not easy because they either: - start from EG(persistent_classes_count) - or only apply to classes
Add const modifier Use unsigned types when the source type is unsigned Use HashTable instead of zvals where possible
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.3)
Can you help keep this open source service alive? 💖 Please sponsor : )