com php-src: Fixed wrong array to string convertion: Zend/zend.c
| From: | Dmitry Stogov | Date: | Mon, 24 Feb 2014 09:30:39 +0000 |
| Subject: | com php-src: Fixed wrong array to string convertion: Zend/zend.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-77976@lists.php.net to get a copy of this message | ||
Commit: e687939f01bfed685534b23aed5d78a8e20ce18e
Author: Xinchen Hui <laruence@gmail.com> Mon, 24 Feb 2014 17:30:39 +0800
Parents: 479b82c0d4c4c0cf3f3ccb4333ba9f2d8df65edd
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e687939f01bfed685534b23aed5d78a8e20ce18e
Log:
Fixed wrong array to string convertion
Changed paths:
M Zend/zend.c
Diff:
diff --git a/Zend/zend.c b/Zend/zend.c
index 485c6a3..532cdf3 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:
{