Skip to content

Zend: Use %pS for zend_string in zend_throw_error #23364

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
arshidkv12 wants to merge 2 commits into
base: master
Choose a base branch
from
+2 −7
Open

Zend: Use %pS for zend_string in zend_throw_error #23364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
699f09d
Zend: Use %pS for zend_string in zend_throw_error
arshidkv12 Aug 19, 2026
5e55e45
Zend: Use %pS for zend_string in zend_throw_error
arshidkv12 Aug 19, 2026
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
6 changes: 1 addition & 5 deletions Zend/zend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1830,11 +1830,7 @@ ZEND_API ZEND_COLD void zend_throw_error(zend_class_entry *exception_ce, const c

//TODO: we can't convert compile-time errors to exceptions yet???
if (EG(current_execute_data) && !CG(in_compilation)) {
// %S is used for zend_string pointers by smart str printing, but normally
// is for wide character strings and so compilers complain if this is inline
// Use "%S" so that the message can contain null bytes.
const char *format = "%S";
zend_throw_exception_ex(exception_ce, 0, format, message);
zend_throw_exception_ex(exception_ce, 0, "%pS", message);
} else {
zend_error_noreturn(E_ERROR, "%s", ZSTR_VAL(message));
}
Expand Down
3 changes: 1 addition & 2 deletions Zend/zend_partial.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,8 +701,7 @@ static zend_op_array *zp_compile(zval *this_ptr, zend_function *function,
zend_op_array *op_array = NULL;

if (UNEXPECTED(function->common.fn_flags2 & ZEND_ACC2_FORBID_DYN_CALLS)) {
const char *format = "Cannot call %S() dynamically";
zend_throw_error(NULL, format, function->common.function_name);
zend_throw_error(NULL, "Cannot call %pS() dynamically", function->common.function_name);
return NULL;
}

Expand Down
Loading