1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix coderange of invalid_encoding_string.<<(ord)

Browse Source 
Appending valid encoding character can change coderange from invalid to valid.
Example: "\x95".force_encoding('sjis')<<0x5C will be a valid string "\x{955C}"
This commit is contained in:
tompng 2024-01-16 02:44:53 +09:00 committed by Nobuyoshi Nakada
parent 0520e9675b
commit ade56737e2
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
string.c
View File

@ -3522,8 +3522,12 @@ rb_str_concat(VALUE str1, VALUE str2)
} }
rb_str_resize(str1, pos+len); rb_str_resize(str1, pos+len);
memcpy(RSTRING_PTR(str1) + pos, buf, 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; cr = ENC_CODERANGE_VALID;
}
else if (cr == ENC_CODERANGE_BROKEN) {
cr = ENC_CODERANGE_UNKNOWN;
}
ENC_CODERANGE_SET(str1, cr); ENC_CODERANGE_SET(str1, cr);
} }
return str1; return str1;

3
test/ruby/test_string.rb
View File

@ -301,6 +301,9 @@ CODE
assert_raise(RangeError, bug) {S("a".force_encoding(Encoding::UTF_8)) << -1} assert_raise(RangeError, bug) {S("a".force_encoding(Encoding::UTF_8)) << -1}
assert_raise(RangeError, bug) {S("a".force_encoding(Encoding::UTF_8)) << 0x81308130} assert_raise(RangeError, bug) {S("a".force_encoding(Encoding::UTF_8)) << 0x81308130}
assert_nothing_raised {S("a".force_encoding(Encoding::GB18030)) << 0x81308130} assert_nothing_raised {S("a".force_encoding(Encoding::GB18030)) << 0x81308130}
s = "\x95".force_encoding(Encoding::SJIS).tap(&:valid_encoding?)
assert_predicate(s << 0x5c, :valid_encoding?)
end end
def test_MATCH # '=~' def test_MATCH # '=~'