summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authortompng <tomoyapenguin@gmail.com>2024-01-16 02:44:53 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2024-01-16 23:18:55 +0900
commitade56737e2273847426214035c0ff2340b43799a (patch)
treebad63eab75e91ff9406ecf56101f9f48144560e0 /string.c
parent0520e9675b91ea559da1ae5eda9db378fbdbca52 (diff)
Fix coderange of invalid_encoding_string.<<(ord)
Appending valid encoding character can change coderange from invalid to valid. Example: "\x95".force_encoding('sjis')<<0x5C will be a valid string "\x{955C}"
Diffstat (limited to 'string.c')
-rw-r--r--string.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/string.c b/string.c
index bb830fc06c..5eda835f4b 100644
--- a/string.c
+++ b/string.c
@@ -3522,8 +3522,12 @@ rb_str_concat(VALUE str1, VALUE str2)
}
rb_str_resize(str1, pos+len);
memcpy(RSTRING_PTR(str1) + pos, buf, len);
- if (cr == ENC_CODERANGE_7BIT && code > 127)
+ if (cr == ENC_CODERANGE_7BIT && code > 127) {
cr = ENC_CODERANGE_VALID;
+ }
+ else if (cr == ENC_CODERANGE_BROKEN) {
+ cr = ENC_CODERANGE_UNKNOWN;
+ }
ENC_CODERANGE_SET(str1, cr);
}
return str1;