diff --git a/Zend/zend_ini_parser.y b/Zend/zend_ini_parser.y index e3042b80c17..d6f33159d89 100644 --- a/Zend/zend_ini_parser.y +++ b/Zend/zend_ini_parser.y @@ -109,8 +109,13 @@ static void zend_ini_add_string(zval *result, zval *op1, zval *op2) ZVAL_PSTRINGL(op1, str->val, str->len); zend_string_release(str); } - op1_len = (int)Z_STRLEN_P(op1); + + if (Z_TYPE_P(op2) != IS_STRING) { + zend_string *str = zval_get_string(op2); + ZVAL_PSTRINGL(op2, str->val, str->len); + zend_string_release(str); + } length = op1_len + (int)Z_STRLEN_P(op2); ZVAL_NEW_STR(result, zend_string_extend(Z_STR_P(op1), length, 1)); diff --git a/ext/standard/tests/general_functions/bug70947.phpt b/ext/standard/tests/general_functions/bug70947.phpt new file mode 100644 index 00000000000..d07e5a331f8 --- /dev/null +++ b/ext/standard/tests/general_functions/bug70947.phpt @@ -0,0 +1,12 @@ +--TEST-- +Bug #70947 (INI parser segfault with INI_SCANNER_TYPED) +--FILE-- + +--EXPECT-- +array(1) { + ["foo"]=> + string(7) "bar 123" +}