Skip to content

Commit ba30c78

Browse files
committed
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
* 'PHP-5.4' of https://git.php.net/repository/php-src: Fixed #65431 in zend_exception.c by Sixd
2 parents 9ad97cd + 8280393 commit ba30c78

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Zend/zend_exceptions.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ void zend_throw_exception_internal(zval *exception TSRMLS_DC) /* {{{ */
8585
{
8686
#ifdef HAVE_DTRACE
8787
if (DTRACE_EXCEPTION_THROWN_ENABLED()) {
88-
char *classname;
89-
int name_len;
88+
const char *classname;
89+
zend_uint name_len;
9090

9191
if (exception != NULL) {
9292
zend_get_object_classname(exception, &classname, &name_len TSRMLS_CC);
93-
DTRACE_EXCEPTION_THROWN(classname);
93+
DTRACE_EXCEPTION_THROWN((char *)classname);
9494
} else {
9595
DTRACE_EXCEPTION_THROWN(NULL);
9696
}

0 commit comments

Comments
 (0)