Skip to content

Commit 7e3283a

Browse files
committed
fix test
1 parent df74007 commit 7e3283a

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

Diff for: ext/zend_test/tests/gh17797.phpt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Warning: require(sumfile.php): Failed to open stream: No such file or directory
2020
require("sumfile.php");
2121
?> on line %d
2222

23-
Fatal error: Uncaught Error: Failed opening required 'sumfile.php' (include_path='.:') in <?php
23+
Fatal error: Uncaught Error: Failed opening required 'sumfile.php' (include_path='.%s') in <?php
2424
require("sumfile.php");
2525
?>:%d
2626
Stack trace:

Diff for: main/fopen_wrappers.c

+3
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,9 @@ PHPAPI zend_string *php_resolve_path(const char *filename, size_t filename_lengt
600600
*/
601601
if (zend_is_executing() &&
602602
(exec_filename = zend_get_executed_filename_ex()) != NULL) {
603+
if (ZSTR_LEN(exec_filename) == 0) {
604+
return NULL;
605+
}
603606
const char *exec_fname = ZSTR_VAL(exec_filename);
604607
size_t exec_fname_length = ZSTR_LEN(exec_filename) - 1;
605608

0 commit comments

Comments
 (0)