com php-src: Fixed #65431 in zend_exception.c by Sixd : Zend/zend_exceptions.c
| From: | Xinchen Hui | Date: | Thu, 15 Aug 2013 03:47:44 +0000 |
| Subject: | com php-src: Fixed #65431 in zend_exception.c by Sixd : Zend/zend_exceptions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72939@lists.php.net to get a copy of this message | ||
Commit: 8280393828e31913da45ba5ae5efbce34d90f8a8
Author: Xinchen Hui <laruence@php.net> Thu, 15 Aug 2013 11:47:44 +0800
Parents: 9d62807190ebda858acbb09ad832c96570a97c40
Branches: PHP-5.4 PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8280393828e31913da45ba5ae5efbce34d90f8a8
Log:
Fixed #65431 in zend_exception.c by Sixd
Bugs:
https://bugs.php.net/65431
Changed paths:
M Zend/zend_exceptions.c
Diff:
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index f07c113..14ae75e 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);
}