com php-src: Reverted 387c491559f1507685740bf613070d27bce59e4d (it broke ext/standard/tests/file/bug44607.phpt): Zend/zend_operators .c
| From: | Dmitry Stogov | Date: | Thu, 26 Jun 2014 20:40:52 +0000 |
| Subject: | com php-src: Reverted 387c491559f1507685740bf613070d27bce59e4d (it broke ext/standard/tests/file/bug44607.phpt): Zend/zend_operators .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79086@lists.php.net to get a copy of this message | ||
Commit: 9af4b18b81502a2bea089a21ae7e43197322abe5
Author: Dmitry Stogov <dmitry@zend.com> Fri, 27 Jun 2014 00:40:52 +0400
Parents: 387c491559f1507685740bf613070d27bce59e4d
Branches: phpng
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9af4b18b81502a2bea089a21ae7e43197322abe5
Log:
Reverted 387c491559f1507685740bf613070d27bce59e4d (it broke ext/standard/tests/file/bug44607.phpt)
Bugs:
https://bugs.php.net/44607
Changed paths:
M Zend/zend_operators.c
Diff:
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
index d64cc62..b40d3b1 100644
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@ -1581,13 +1581,15 @@ ZEND_API int concat_function(zval *result, zval *op1, zval *op2 TSRMLS_DC)
/* {{
Z_STR_P(result) = STR_REALLOC(Z_STR_P(result), res_len, 0 );
Z_TYPE_INFO_P(result) = IS_STRING_EX;
- memcpy(Z_STRVAL_P(result) + op1_len, Z_STRVAL_P(op2), op2_len + 1);
+ memcpy(Z_STRVAL_P(result) + op1_len, Z_STRVAL_P(op2), op2_len);
+ Z_STRVAL_P(result)[res_len]=0;
} else {
int length = Z_STRLEN_P(op1) + Z_STRLEN_P(op2);
zend_string *buf = STR_ALLOC(length, 0);
memcpy(buf->val, Z_STRVAL_P(op1), Z_STRLEN_P(op1));
- memcpy(buf->val + Z_STRLEN_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op2) + 1);
+ memcpy(buf->val + Z_STRLEN_P(op1), Z_STRVAL_P(op2), Z_STRLEN_P(op2));
+ buf->val[length] = 0;
ZVAL_NEW_STR(result, buf);
}
if (use_copy1) {