Commit c583124

committed

Merge branch 'PHP-8.3' into PHP-8.4

* PHP-8.3: Fix GH-19720: Assertion failure when error handler throws when accessing a deprecated constant

2 parents 1b49d0e + 9d69ab9 commit c583124Copy full SHA for c583124

File tree

+30

-0

lines changed

+30

-0

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ PHP NEWS`
`12`	`12`	`. Fixed bug GH-19613 (Stale array iterator pointer). (ilutov)`
`13`	`13`	`. Fixed bug GH-19679 (zend_ssa_range_widening may fail to converge). (Arnaud)`
`14`	`14`	`. Fixed bug GH-19681 (PHP_EXPAND_PATH broken with bash 5.3.0). (Remi)`
	`15`	`+ . Fixed bug GH-19720 (Assertion failure when error handler throws when`
	`16`	`+ accessing a deprecated constant). (nielsdos)`
`15`	`17`
`16`	`18`	`- CLI:`
`17`	`19`	`. Fixed bug GH-19461 (Improve error message on listening error with IPv6`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1512,6 +1512,9 @@ ZEND_API zend_result zend_update_class_constant(zend_class_constant *c, const ze`
`1512`	`1512`	`zval_ptr_dtor(&c->value);`
`1513`	`1513`	`ZVAL_COPY_VALUE(&c->value, &tmp);`
`1514`	`1514`
	`1515`	`+ /* may not return SUCCESS in case of an exception,`
	`1516`	`+ * should've returned FAILURE in zval_update_constant_ex! */`
	`1517`	`+ ZEND_ASSERT(!EG(exception));`
`1515`	`1518`	`return SUCCESS;`
`1516`	`1519`	`}`
`1517`	`1520`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -464,6 +464,9 @@ ZEND_API zval zend_get_constant_ex(zend_string cname, zend_class_entry *scope,`
`464`	`464`
`465`	`465`	`if (!(flags & ZEND_FETCH_CLASS_SILENT) && (ZEND_CONSTANT_FLAGS(c) & CONST_DEPRECATED)) {`
`466`	`466`	`zend_error(E_DEPRECATED, "Constant %s is deprecated", name);`
	`467`	`+ if (UNEXPECTED(EG(exception))) {`
	`468`	`+ return NULL;`
	`469`	`+ }`
`467`	`470`	`}`
`468`	`471`	`return &c->value;`
`469`	`472`	`}`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,22 @@`
	`1`	`+--TEST--`
	`2`	`+GH-19720 (Assertion failure when error handler throws when accessing a deprecated constant)`
	`3`	`+--EXTENSIONS--`
	`4`	`+zend_test`
	`5`	`+--FILE--`
	`6`	`+<?php`
	`7`	`+class Test {`
	`8`	`+ public const MyConst = [ZEND_TEST_DEPRECATED => 42];`
	`9`	`+}`
	`10`	`+`
	`11`	`+set_error_handler(function ($_, $errstr) {`
	`12`	`+ throw new Exception($errstr);`
	`13`	`+});`
	`14`	`+`
	`15`	`+try {`
	`16`	`+ var_dump(Test::MyConst);`
	`17`	`+} catch (Exception $e) {`
	`18`	`+ echo $e->getMessage(), "\n";`
	`19`	`+}`
	`20`	`+?>`
	`21`	`+--EXPECT--`
	`22`	`+Constant ZEND_TEST_DEPRECATED is deprecated`

Comments

(0)