Skip to content

Zend: Exception::__toString() no need to allocate the method name #19025

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
+31 −23
Draft

Zend: Exception::__toString() no need to allocate the method name #19025

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
3f6e664
Zend/zend_exceptions: Add const modifiers
Girgias Jul 4, 2025
f4a7ae7
Zend: Exception::__toString() no need to allocate the method name
Girgias Jul 3, 2025
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
52 changes: 30 additions & 22 deletions Zend/zend_exceptions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ static int zend_implement_throwable(zend_class_entry *interface, zend_class_entr
{
/* zend_ce_exception and zend_ce_error may not be initialized yet when this is called (e.g when
* implementing Throwable for Exception itself). Perform a manual inheritance check. */
zend_class_entry *root = class_type;
const zend_class_entry *root = class_type;
while (root->parent) {
root = root->parent;
}
Expand All @@ -89,13 +89,13 @@ static int zend_implement_throwable(zend_class_entry *interface, zend_class_entr
}
/* }}} */

static inline zend_class_entry *i_get_exception_base(zend_object *object) /* {{{ */
static inline zend_class_entry *i_get_exception_base(const zend_object *object) /* {{{ */
{
return instanceof_function(object->ce, zend_ce_exception) ? zend_ce_exception : zend_ce_error;
}
/* }}} */

ZEND_API zend_class_entry *zend_get_exception_base(zend_object *object) /* {{{ */
ZEND_API zend_class_entry *zend_get_exception_base(const zend_object *object) /* {{{ */
{
return i_get_exception_base(object);
}
Expand Down Expand Up @@ -192,7 +192,7 @@ ZEND_API ZEND_COLD void zend_throw_exception_internal(zend_object *exception) /*
#endif /* HAVE_DTRACE */

if (exception != NULL) {
zend_object *previous = EG(exception);
const zend_object *previous = EG(exception);
if (previous && zend_is_unwind_exit(previous)) {
/* Don't replace unwinding exception with different exception. */
OBJ_RELEASE(exception);
Expand Down Expand Up @@ -695,32 +695,43 @@ ZEND_METHOD(Exception, __toString)
zval trace, *exception;
zend_class_entry *base_ce;
zend_string *str;
zend_fcall_info fci;
zval rv, tmp;
zend_string *fname;

ZEND_PARSE_PARAMETERS_NONE();

str = ZSTR_EMPTY_ALLOC();

exception = ZEND_THIS;
fname = ZSTR_INIT_LITERAL("gettraceasstring", 0);
base_ce = i_get_exception_base(Z_OBJ_P(exception));

/* As getTraceAsString method is final we can grab it once */
zend_function *getTraceAsString = zend_hash_str_find_ptr(&base_ce->function_table, ZEND_STRL("gettraceasstring"));
ZEND_ASSERT(getTraceAsString && "Method getTraceAsString must exist");


zend_fcall_info fci;
fci.size = sizeof(fci);
ZVAL_UNDEF(&fci.function_name);
fci.retval = &trace;
fci.param_count = 0;
fci.params = NULL;
fci.object = NULL;
fci.named_params = NULL;

zend_fcall_info_cache fcc;
fcc.function_handler = getTraceAsString;
fcc.called_scope = base_ce;
fcc.closure = NULL;

while (exception && Z_TYPE_P(exception) == IS_OBJECT && instanceof_function(Z_OBJCE_P(exception), zend_ce_throwable)) {
zend_string *prev_str = str;
zend_string *message = zval_get_string(GET_PROPERTY(exception, ZEND_STR_MESSAGE));
zend_string *file = zval_get_string(GET_PROPERTY(exception, ZEND_STR_FILE));
zend_long line = zval_get_long(GET_PROPERTY(exception, ZEND_STR_LINE));

fci.size = sizeof(fci);
ZVAL_STR(&fci.function_name, fname);
fci.object = Z_OBJ_P(exception);
fci.retval = &trace;
fci.param_count = 0;
fci.params = NULL;
fci.named_params = NULL;

zend_call_function(&fci, NULL);
fcc.object = Z_OBJ_P(exception);
fcc.calling_scope = Z_OBJCE_P(exception);
zend_call_function(&fci, &fcc);

if (Z_TYPE(trace) != IS_STRING) {
zval_ptr_dtor(&trace);
Expand Down Expand Up @@ -765,11 +776,11 @@ ZEND_METHOD(Exception, __toString)
break;
}
}
zend_string_release_ex(fname, 0);

exception = ZEND_THIS;
/* Reset apply counts */
while (Z_TYPE_P(exception) == IS_OBJECT && (base_ce = i_get_exception_base(Z_OBJ_P(exception))) && instanceof_function(Z_OBJCE_P(exception), base_ce)) {
zend_class_entry *previous_base_ce;
while (Z_TYPE_P(exception) == IS_OBJECT && (previous_base_ce = i_get_exception_base(Z_OBJ_P(exception))) && instanceof_function(Z_OBJCE_P(exception), previous_base_ce)) {
if (Z_IS_RECURSIVE_P(exception)) {
Z_UNPROTECT_RECURSION_P(exception);
} else {
Expand All @@ -779,13 +790,10 @@ ZEND_METHOD(Exception, __toString)
ZVAL_DEREF(exception);
}

exception = ZEND_THIS;
base_ce = i_get_exception_base(Z_OBJ_P(exception));

/* We store the result in the private property string so we can access
* the result in uncaught exception handlers without memleaks. */
ZVAL_STR(&tmp, str);
zend_update_property_ex(base_ce, Z_OBJ_P(exception), ZSTR_KNOWN(ZEND_STR_STRING), &tmp);
zend_update_property_ex(base_ce, Z_OBJ_P(ZEND_THIS), ZSTR_KNOWN(ZEND_STR_STRING), &tmp);

RETURN_STR(str);
}
Expand Down
2 changes: 1 addition & 1 deletion Zend/zend_exceptions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ ZEND_API ZEND_COLD void zend_throw_exception_internal(zend_object *exception);

void zend_register_default_exception(void);

ZEND_API zend_class_entry *zend_get_exception_base(zend_object *object);
ZEND_API zend_class_entry *zend_get_exception_base(const zend_object *object);

/* Deprecated - Use zend_ce_exception directly instead */
ZEND_API zend_class_entry *zend_exception_get_default(void);
Expand Down