com php-src: Revert "Do not truncate exception traces upon anon class name": Zend/zend_exceptions.c
| From: | Dmitry Stogov | Date: | Tue, 18 Aug 2015 09:03:04 +0000 |
| Subject: | com php-src: Revert "Do not truncate exception traces upon anon class name": Zend/zend_exceptions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88576@lists.php.net to get a copy of this message | ||
Commit: d9a9b8572b0064acb5773b795f7deb9cfa8b7a25
Author: Dmitry Stogov <dmitry@zend.com> Tue, 18 Aug 2015 12:03:04 +0300
Parents: 17fc5cc65d3e7426516421f8bc950a97e1945f2f
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d9a9b8572b0064acb5773b795f7deb9cfa8b7a25
Log:
Revert "Do not truncate exception traces upon anon class name"
This reverts commit b0c77fb80c9bceac37ec266f2d5a20131755c44a.
Changed paths:
M Zend/zend_exceptions.c
Diff:
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 7a9e232..307589b 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -442,7 +442,7 @@ ZEND_METHOD(error_exception, getSeverity)
zend_error(E_WARNING, "Value for %s is no string", key); \
smart_str_appends(str, "[unknown]"); \
} else { \
- smart_str_append_escaped(str, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); \
+ smart_str_append(str, Z_STR_P(tmp)); \
} \
} \
} while (0)
@@ -556,7 +556,7 @@ static void _build_trace_args(zval *arg, smart_str *str) /* {{{ */
break;
case IS_OBJECT:
smart_str_appends(str, "Object(");
- smart_str_append_escaped(str, ZSTR_VAL(Z_OBJCE_P(arg)->name),
ZSTR_LEN(Z_OBJCE_P(arg)->name));
+ smart_str_append(str, Z_OBJCE_P(arg)->name);
smart_str_appends(str, "), ");
break;
}