Fixed bug #60569 (Nullbyte truncates Exception $message).

15 years ago · 2cc64c28f0
3 changed files with 2 additions and 1 deletions
--- a/1
+++ b/1
@ -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
--- a/Zend/tests/bug60569.phpt
+++ b/Zend/tests/bug60569.phpt
--- 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) {