php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-8.4'

Browse Source
This commit is contained in:
David Carlier
2025-02-23 10:45:55 +00:00
parent 67a349d8f3 e8dda54dd5
commit f89b0a229c
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ext/opcache/ZendAccelerator.c
View File

@@ -1345,7 +1345,12 @@ zend_string *accel_make_persistent_key(zend_string *str)
EXPECTED((parent_script = zend_get_executed_filename_ex()) != NULL)) {
parent_script_len = ZSTR_LEN(parent_script);
while ((--parent_script_len > 0) && !IS_SLASH(ZSTR_VAL(parent_script)[parent_script_len]));
while (parent_script_len > 0) {
--parent_script_len;
if (IS_SLASH(ZSTR_VAL(parent_script)[parent_script_len])) {
break;
}
}
if (UNEXPECTED((size_t)(key_length + parent_script_len + 1) >= ZCG_KEY_LEN)) {
return NULL;

34
ext/zend_test/tests/gh17899.phpt Normal file
View File

@@ -0,0 +1,34 @@
--TEST--
GH-17899 (zend_test_compile_string with opcache crash on invalid script path)
--EXTENSIONS--
zend_test
--INI--
opcache.enable_cli=1
--CREDITS--
YuanchengJiang
--FILE--
<?php
$source = '<?php
require("sumfile.php");
?>';
try {zend_test_compile_string($source,$source,$c);} catch (Exception $e) { echo($e); }
--EXPECTF--
Warning: Undefined variable $c in %s on line %d
Deprecated: zend_test_compile_string(): Passing null to parameter #3 ($position) of type int is deprecated in %s on line %d
Warning: require(sumfile.php): Failed to open stream: No such file or directory in <?php
require("sumfile.php");
?> on line %d
Fatal error: Uncaught Error: Failed opening required 'sumfile.php' (include_path='.%s') in <?php
require("sumfile.php");
?>:%d
Stack trace:
#0 %s(%d): zend_test_compile_string('<?php\nrequire("...', '<?php\nrequire("...', NULL)
#1 {main}
thrown in <?php
require("sumfile.php");
?> on line %d