fix: don't delete an unitialized timer #12537
Merged
Conversation
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
|
Should this target a release branch? |
|
I would say it should indeed. |
|
Target branch fixed. |
arnaud-lb
added a commit
that referenced
this pull request
Oct 29, 2023
* PHP-8.1: [ci skip] NEWS fix: don't delete an unitialized timer (#12537)
arnaud-lb
added a commit
that referenced
this pull request
Oct 29, 2023
* PHP-8.2: [ci skip] NEWS [ci skip] NEWS fix: don't delete an unitialized timer (#12537)
arnaud-lb
added a commit
that referenced
this pull request
Oct 29, 2023
* PHP-8.3: [ci skip] NEWS [ci skip] NEWS [ci skip] NEWS fix: don't delete an unitialized timer (#12537)
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This change (proposed by @arnaud-lb) prevents calling
timer_delete()on an uninitialized timer in https://github.com/php/php-src/blob/php-8.1.25/Zend/zend_max_execution_timer.c#L96 in case the timer has not been created (e.g.: when running out of available kernel timers under high loads).