From: Xinchen Hui <laruence@gmail.com>
Date: Mon, 24 Feb 2014 09:30:39 +0000 (+0800)
Subject: Fixed wrong array to string convertion
X-Git-Tag: POST_PHPNG_MERGE~412^2~556^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e687939f01bfed685534b23aed5d78a8e20ce18e;p=php

Fixed wrong array to string convertion
---

diff --git a/Zend/zend.c b/Zend/zend.c
index 485c6a3880..532cdf35e2 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -248,7 +248,7 @@ ZEND_API void zend_make_printable_zval(zval *expr, zval *expr_copy, int *use_cop
 		case IS_ARRAY:
 			zend_error(E_NOTICE, "Array to string conversion");
 			// TODO: ??? use interned string
-			Z_STR_P(expr_copy) = STR_INIT("Array", 1, 0);
+			Z_STR_P(expr_copy) = STR_INIT("Array", sizeof("Array") - 1, 0);
 			break;
 		case IS_OBJECT:
 			{