Skip to content

Commit ade5673

Browse files
tompngnobu
authored andcommitted
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}"
1 parent 0520e96 commit ade5673

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

string.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3522,8 +3522,12 @@ rb_str_concat(VALUE str1, VALUE str2)
35223522
}
35233523
rb_str_resize(str1, pos+len);
35243524
memcpy(RSTRING_PTR(str1) + pos, buf, len);
3525-
if (cr == ENC_CODERANGE_7BIT && code > 127)
3525+
if (cr == ENC_CODERANGE_7BIT && code > 127) {
35263526
cr = ENC_CODERANGE_VALID;
3527+
}
3528+
else if (cr == ENC_CODERANGE_BROKEN) {
3529+
cr = ENC_CODERANGE_UNKNOWN;
3530+
}
35273531
ENC_CODERANGE_SET(str1, cr);
35283532
}
35293533
return str1;

test/ruby/test_string.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,9 @@ def test_LSHIFT # '<<'
301301
assert_raise(RangeError, bug) {S("a".force_encoding(Encoding::UTF_8)) << -1}
302302
assert_raise(RangeError, bug) {S("a".force_encoding(Encoding::UTF_8)) << 0x81308130}
303303
assert_nothing_raised {S("a".force_encoding(Encoding::GB18030)) << 0x81308130}
304+
305+
s = "\x95".force_encoding(Encoding::SJIS).tap(&:valid_encoding?)
306+
assert_predicate(s << 0x5c, :valid_encoding?)
304307
end
305308

306309
def test_MATCH # '=~'

0 commit comments

Comments
 (0)