Skip to content

Fix GH-22849: error_include_args=1 mishandled for include() #22851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
NattyNarwhal wants to merge 1 commit into
base: master
Choose a base branch
from
+44 −0
Open

Fix GH-22849: error_include_args=1 mishandled for include() #22851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions Zend/tests/gh22849.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
--TEST--
PHP 8.6 error_include_args=1 mishandled for include()
--INI--
error_include_args=On
--FILE--
<?php

function foo() {
include("does not exist");
include_once("does not exist");
require("does not exist");
}

foo(1, 2);
?>
--EXPECTF--
Warning: include('does not exist'): Failed to open stream: No such file or directory in %s on line %d

Warning: include('does not exist'): Failed opening 'does not exist' for inclusion (include_path='%s') in %s on line %d

Warning: include_once('does not exist'): Failed to open stream: No such file or directory in %s on line %d

Warning: include_once('does not exist'): Failed opening 'does not exist' for inclusion (include_path='%s') in %s on line %d

Warning: require('does not exist'): Failed to open stream: No such file or directory in %s on line %d

Fatal error: Uncaught Error: Failed opening required 'does not exist' (include_path='%s') in %s:%d
Stack trace:
#0 %s(%d): foo(1, 2)
#1 {main}
thrown in %s on line %d
13 changes: 13 additions & 0 deletions Zend/zend_exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,19 @@ ZEND_API zend_string *zend_trace_function_args_to_string(const HashTable *frame)
/* {{{ Gets the currently executing function's arguments as a string. Used by php_verror. */
ZEND_API zend_string *zend_trace_current_function_args_string(void) {
zend_string *dynamic_params = NULL;
/* Special case: require_once/include_once aren't functions, but we
* want to capture their arguments anyways, for i.e. file not found.
*/
zend_execute_data *execute_data = EG(current_execute_data);
if (execute_data && execute_data->func
&& ZEND_USER_CODE(execute_data->func->common.type)
&& (execute_data->opline->opcode == ZEND_INCLUDE_OR_EVAL)) {
zval *inc_filename = RT_CONSTANT(execute_data->opline, execute_data->opline->op1);
smart_str str = {0};
build_trace_args(inc_filename, &str);
return smart_str_extract(&str);
}

/* get a backtrace to snarf function args */
zval backtrace;
zend_fetch_debug_backtrace(&backtrace, /* skip_last */ 0, /* options */ 0, /* limit */ 1);
Expand Down
Loading