[pull] master from php:master - #1126
Merged
Merged
Conversation
The return value of the function registered with CURLOPT_PREREQFUNCTION was not cleaned up when it returned an invalid non-int type. Destroy the callback return value before throwing a TypeError. The test now returns a dynamically allocated array containing random_bytes(), so leak detection exercises the zval cleanup path reliably. Closes #22726
* PHP-8.4: Fix leak when cURL PREREQFUNCTION returns a type other than int (#22726)
* PHP-8.5: Fix leak when cURL PREREQFUNCTION returns a type other than int (#22726)
#22542) db7193f sets EX(opline) before zend_vm_stack_extend() so that a fatal error raised while a call frame is pushed can walk the backtrace, but the wrappers doing it were compiled only for global-register CALL/HYBRID builds. Elsewhere the save is skipped, and a frame entered by the tracing JIT still holds a NULL opline when its first INIT_FCALL hits the memory limit. Thread execute_data and opline into the wrappers so that every VM kind performs the save. Fixes GH-18847 Closes GH-22542
The only macro versions being preserved are those passing STREAMS_DC in debug builds.
By dropping the unused flags parameter of the _-prefixed version
By turning the _-prefixed version into a static extended version
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.
4 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 : )