php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-24 00:02:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix string coercion for $a .= $a (#11296)

Browse Source 
free_op2_string may be set to false when the operands are not strings, and
`result == op1 == op2`, by re-using the same string for both operands. In that
case, the string should still be copied to result because result is not actually
a string. Also change the op1 branch to stay consistent.

Introduced by GH-10049
This commit is contained in:
Ilija Tovilo
2023-05-22 19:48:07 +02:00
committed by GitHub
parent c230aa9be3
commit 5c741644d1
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Zend/tests/bug79836_3.phpt Normal file
View File

@@ -0,0 +1,10 @@
--TEST--
Bug #79836 ($a .= $a should coerce to string)
--FILE--
<?php
$a = false;
$a .= $a;
var_dump($a);
?>
--EXPECT--
string(0) ""

4
Zend/zend_operators.c
View File

@@ -2005,7 +2005,7 @@ ZEND_API zend_result ZEND_FASTCALL concat_function(zval *result, zval *op1, zval
has_op2_string:;
if (UNEXPECTED(ZSTR_LEN(op1_string) == 0)) {
if (EXPECTED(free_op2_string || result != op2)) {
if (EXPECTED(result != op2 || Z_TYPE_P(result) != IS_STRING)) {
if (result == orig_op1) {
i_zval_ptr_dtor(result);
}
@@ -2018,7 +2018,7 @@ has_op2_string:;
}
}
} else if (UNEXPECTED(ZSTR_LEN(op2_string) == 0)) {
if (EXPECTED(free_op1_string || result != op1)) {
if (EXPECTED(result != op1 || Z_TYPE_P(result) != IS_STRING)) {
if (result == orig_op1) {
i_zval_ptr_dtor(result);
}