Merge branch 'PHP-7.1'

nikic · nikic · commit 3df43437fe76 · 2016-12-21T22:12:17.000+01:00
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
@@ -1858,7 +1858,7 @@ zend_ast *zend_negate_num_string(zend_ast *ast) /* {{{ */
 		}
 	} else if (Z_TYPE_P(zv) == IS_STRING) {
 		size_t orig_len = Z_STRLEN_P(zv);
-		zend_string_extend(Z_STR_P(zv), orig_len + 1, 0);
+		Z_STR_P(zv) = zend_string_extend(Z_STR_P(zv), orig_len + 1, 0);
 		memmove(Z_STRVAL_P(zv) + 1, Z_STRVAL_P(zv), orig_len + 1);
 		Z_STRVAL_P(zv)[0] = '-';
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -1858,7 +1858,7 @@ zend_ast zend_negate_num_string(zend_ast ast) /* {{{ */`
`1858`	`1858`	`}`
`1859`	`1859`	`} else if (Z_TYPE_P(zv) == IS_STRING) {`
`1860`	`1860`	`size_t orig_len = Z_STRLEN_P(zv);`
`1861`		`- zend_string_extend(Z_STR_P(zv), orig_len + 1, 0);`
	`1861`	`+ Z_STR_P(zv) = zend_string_extend(Z_STR_P(zv), orig_len + 1, 0);`
`1862`	`1862`	`memmove(Z_STRVAL_P(zv) + 1, Z_STRVAL_P(zv), orig_len + 1);`
`1863`	`1863`	`Z_STRVAL_P(zv)[0] = '-';`
`1864`	`1864`	`} else {`