From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 11 Mar 2012 18:15:13 +0000 (+0000)
Subject: Fixed bug #60569 (Nullbyte truncates Exception $message).
X-Git-Tag: PHP-5.4.1-RC1~26^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2cc64c28f0d487aefed80ea8855b497679f22c27;p=php

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

diff --git a/NEWS b/NEWS
index 7973b99bed..3318144355 100644
--- a/NEWS
+++ b/NEWS
@@ -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
new file mode 100644
index 0000000000..56aaa2c602
Binary files /dev/null and b/Zend/tests/bug60569.phpt differ
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) {