diff options
| author | Christopher Jones <sixd@php.net> | 2013-08-14 21:32:13 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-08-14 21:32:13 -0700 |
| commit | 5a186a3e0ad66dd5a921def7d45340b979d15293 (patch) | |
| tree | a632260a75925ff4caddd56bb8c74ee79c1d2640 | |
| parent | cd14de94d2428a28c8bfad1aad9837c59ab81e8f (diff) | |
| parent | cb361ed27ebaf490cac6fb134380daf162a68750 (diff) | |
| download | php-git-5a186a3e0ad66dd5a921def7d45340b979d15293.tar.gz | |
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
* 'PHP-5.5' of https://git.php.net/repository/php-src:
Fixed #65431 in zend_exception.c by Sixd
| -rw-r--r-- | Zend/zend_exceptions.c | 6 |
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); } |