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.5.0alpha1~441
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4f05fbffc6f63e094c0f737e0477e27f1bf5f7f;p=php

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

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 93b4d651a0..7bb7792a4c 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -205,7 +205,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) {