Skip to content

fix: don't delete an unitialized timer - #12537

Merged
arnaud-lb merged 1 commit into
php:PHP-8.1from
dunglas:fix/ensure-timer-init
Oct 29, 2023
Merged

fix: don't delete an unitialized timer#12537
arnaud-lb merged 1 commit into
php:PHP-8.1from
dunglas:fix/ensure-timer-init

Conversation

@dunglas

@dunglas dunglas commented Oct 27, 2023

Copy link
Copy Markdown
Member

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).

@staabm

staabm commented Oct 27, 2023

Copy link
Copy Markdown
Contributor

Should this target a release branch?

@devnexen

Copy link
Copy Markdown
Member

I would say it should indeed.

@dunglas
dunglas changed the base branch from master to PHP-8.1 October 27, 2023 20:55
@dunglas

dunglas commented Oct 27, 2023

Copy link
Copy Markdown
Member Author

Target branch fixed.

@arnaud-lb
arnaud-lb merged commit 39f3374 into php:PHP-8.1 Oct 29, 2023
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)
@arnaud-lb

Copy link
Copy Markdown
Member

Thank you!

@dunglas
dunglas deleted the fix/ensure-timer-init branch October 29, 2023 13:21
adrian-enspired pushed a commit to adrian-enspired/php-src that referenced this pull request Aug 4, 2026
adrian-enspired pushed a commit to adrian-enspired/php-src that referenced this pull request Aug 4, 2026
* PHP-8.1:
  [ci skip] NEWS
  fix: don't delete an unitialized timer (php#12537)
adrian-enspired pushed a commit to adrian-enspired/php-src that referenced this pull request Aug 4, 2026
* PHP-8.2:
  [ci skip] NEWS
  [ci skip] NEWS
  fix: don't delete an unitialized timer (php#12537)
adrian-enspired pushed a commit to adrian-enspired/php-src that referenced this pull request Aug 4, 2026
* PHP-8.3:
  [ci skip] NEWS
  [ci skip] NEWS
  [ci skip] NEWS
  fix: don't delete an unitialized timer (php#12537)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants