mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-16 21:37:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.2'

Browse Source 
* PHP-8.2:
  Fix incorrect CG(memoize_mode) state after bailout in ??=
This commit is contained in:
Ilija Tovilo 2023-04-20 19:46:34 +02:00
commit 6ca6b46234
No known key found for this signature in database
GPG Key ID: A4F5D403F118200A
4 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Zend/tests/gh11108.phpt Normal file
View File

@ -0,0 +1,11 @@
--TEST--
GH-11108: Incorrect CG(memoize_mode) state after bailout in ??=
--FILE--
<?php
register_shutdown_function(function() {
include __DIR__ . '/gh11108_shutdown.inc';
});
include __DIR__ . '/gh11108_test.inc';
?>
--EXPECTF--
Fatal error: Cannot use [] for reading in %s on line %d

5
Zend/tests/gh11108_shutdown.inc Normal file
View File

@ -0,0 +1,5 @@
<?php
function test() {
throw new Exception();
}

3
Zend/tests/gh11108_test.inc Normal file
View File

@ -0,0 +1,3 @@
<?php
$messageList[] ??= true;

1
Zend/zend.c
View File

@ -1190,6 +1190,7 @@ ZEND_API ZEND_COLD ZEND_NORETURN void _zend_bailout(const char *filename, uint32
CG(unclean_shutdown) = 1;
CG(active_class_entry) = NULL;
CG(in_compilation) = 0;
CG(memoize_mode) = 0;
EG(current_execute_data) = NULL;
LONGJMP(*EG(bailout), FAILURE);
}