diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | Zend/tests/bug60569.phpt | bin | 0 -> 288 bytes | |||
| -rw-r--r-- | Zend/zend_exceptions.c | 2 |
3 files changed, 2 insertions, 1 deletions
@@ -21,6 +21,7 @@ PHP NEWS . Fixed bug #60825 (Segfault when running symfony 2 tests). (Dmitry, Laruence) . Fixed bug #60801 (strpbrk() mishandles NUL byte). (Adam) + . Fixed bug #60569 (Nullbyte truncates Exception $message). (Ilia) . Fixed bug #60227 (header() cannot detect the multi-line header with CR). (rui, Gustavo) . Fixed bug #52719 (array_walk_recursive crashes if third param of the diff --git a/Zend/tests/bug60569.phpt b/Zend/tests/bug60569.phpt Binary files differnew file mode 100644 index 0000000000..56aaa2c602 --- /dev/null +++ b/Zend/tests/bug60569.phpt diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 308910dfb2..a83053e120 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -192,7 +192,7 @@ ZEND_METHOD(exception, __construct) object = getThis(); if (message) { - zend_update_property_string(default_exception_ce, object, "message", sizeof("message")-1, message TSRMLS_CC); + zend_update_property_stringl(default_exception_ce, object, "message", sizeof("message")-1, message, message_len TSRMLS_CC); } if (code) { |