[pull] master from php:master#822
Merged
Merged
Conversation
`vptr` points to the current value being iterated over, not `value`, see other switch cases. Closes GH-22249.
* PHP-8.4: exif: read from the correct pointer
* PHP-8.5: exif: read from the correct pointer
This function was missing for consistency with the other functions which all have a `cstr` variant. Adding this function also made it easy to convert some more copy-and-pasted logic.
Based on Nora's suggestion of not using an unnecesary allocation.
- static modifier is added for php_uri_parser_rfc3986_parse() - const modifier is added for component read and write handler parameters
zend_parse_arg_bool_weak and zend_parse_arg_str_weak could return success with EG(exception) already set, because zend_is_true and convert_to_string emit the NaN coercion warning without checking whether the user error handler threw. Recv-arg verification for a userland function then took the no-check ZEND_VM_NEXT_OPCODE branch, aborting on ZEND_ASSERT(!EG(exception)). Mirror the existing check in zend_parse_arg_long_weak and propagate failure when the warning leaves an exception pending. Fixes GH-22112 Closes GH-22114
* zend_observer: Convert `ZEND_OBSERVER_HANDLE()` to inline function * zend_observer: Convert `ZEND_OBSERVER_FCALL_(BEGIN|END)()` to inline functions
…ons (#22297) `zend_free_trampoline()` requires access to the globals and thus cannot easily be made an inline function without moving it to a different (less-appropriate) header. Since trampolines should be comparatively rare, having an extra function call here should be okay.
* PHP-8.5: Fix GH-22112: assertion when error handler throws during NaN coercion
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.4)
Can you help keep this open source service alive? 💖 Please sponsor : )