summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Jones <sixd@php.net>2013-08-14 21:32:07 -0700
committerChristopher Jones <sixd@php.net>2013-08-14 21:32:07 -0700
commitba30c78d5ca1edfa593c32bfa203cf6ea7f942b2 (patch)
treebe442deed16df6626bb06c18ac8c3acc2adcabb3
parent9ad97cd48903ea5454853960f2c14de326e0f624 (diff)
parent8280393828e31913da45ba5ae5efbce34d90f8a8 (diff)
downloadphp-git-ba30c78d5ca1edfa593c32bfa203cf6ea7f942b2.tar.gz
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
-rw-r--r--Zend/zend_exceptions.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index f07c1135f0..14ae75e38d 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -85,12 +85,12 @@ void zend_throw_exception_internal(zval *exception TSRMLS_DC) /* {{{ */
{
#ifdef HAVE_DTRACE
if (DTRACE_EXCEPTION_THROWN_ENABLED()) {
- char *classname;
- int name_len;
+ const char *classname;
+ zend_uint name_len;
if (exception != NULL) {
zend_get_object_classname(exception, &classname, &name_len TSRMLS_CC);
- DTRACE_EXCEPTION_THROWN(classname);
+ DTRACE_EXCEPTION_THROWN((char *)classname);
} else {
DTRACE_EXCEPTION_THROWN(NULL);
}