Skip to content

Fix date error messages for embedded NUL bytes #22997

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 1 commit into
base: master
Choose a base branch
from
Open

Fix date error messages for embedded NUL bytes #22997

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
9 changes: 4 additions & 5 deletions Zend/zend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1815,7 +1815,6 @@ ZEND_API void zend_free_recorded_errors(void)
ZEND_API ZEND_COLD void zend_throw_error(zend_class_entry *exception_ce, const char *format, ...) /* {{{ */
{
va_list va;
char *message = NULL;

if (!exception_ce) {
exception_ce = zend_ce_error;
Expand All @@ -1827,13 +1826,13 @@ ZEND_API ZEND_COLD void zend_throw_error(zend_class_entry *exception_ce, const c
}

va_start(va, format);
zend_vspprintf(&message, 0, format, va);

zend_string *message = zend_vstrpprintf(0, format, va);
//TODO: we can't convert compile-time errors to exceptions yet???
if (EG(current_execute_data) && !CG(in_compilation)) {
zend_throw_exception(exception_ce, message, 0);
const char *format = "%S";
zend_throw_exception_ex(exception_ce, 0, format, message);
} else {
zend_error_noreturn(E_ERROR, "%s", message);
zend_error_noreturn(E_ERROR, "%s", ZSTR_VAL(message));
}

efree(message);
Expand Down
Loading
Loading