Concatenating two valid UTF-8 strings produces a valid UTF-8 string

Girgias · Girgias · commit 5d983b2a8a08 · 2023-01-27T16:36:00.000Z
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
@@ -1984,6 +1984,9 @@ ZEND_API zend_result ZEND_FASTCALL concat_function(zval *result, zval *op1, zval
 
 		memcpy(ZSTR_VAL(result_str) + op1_len, Z_STRVAL_P(op2), op2_len);
 		ZSTR_VAL(result_str)[result_len] = '\0';
+		if (ZSTR_IS_VALID_UTF8(Z_STR_P(op1)) && ZSTR_IS_VALID_UTF8(Z_STR_P(op2))) {
+			GC_ADD_FLAGS(result_str, IS_STR_VALID_UTF8);
+		}
 	}
 
 	zval_ptr_dtor_str(&op1_copy);

Original file line number	Diff line number	Diff line change
`@@ -1984,6 +1984,9 @@ ZEND_API zend_result ZEND_FASTCALL concat_function(zval result, zval op1, zval`
`1984`	`1984`
`1985`	`1985`	`memcpy(ZSTR_VAL(result_str) + op1_len, Z_STRVAL_P(op2), op2_len);`
`1986`	`1986`	`ZSTR_VAL(result_str)[result_len] = '\0';`
	`1987`	`+ if (ZSTR_IS_VALID_UTF8(Z_STR_P(op1)) && ZSTR_IS_VALID_UTF8(Z_STR_P(op2))) {`
	`1988`	`+ GC_ADD_FLAGS(result_str, IS_STR_VALID_UTF8);`
	`1989`	`+ }`
`1987`	`1990`	`}`
`1988`	`1991`
`1989`	`1992`	`zval_ptr_dtor_str(&op1_copy);`