kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

encoding.c: mask dummy flags

Browse source 
* encoding.c (must_encindex, rb_enc_from_index, rb_obj_encoding): mask
  encoding index and ignore dummy flags.  [ruby-core:59354] [Bug #9314]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-12-30 09:34:19 +00:00
parent 8e0013ea45
commit 5db5677c66
3 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Dec 30 18:34:18 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (must_encindex, rb_enc_from_index, rb_obj_encoding): mask
encoding index and ignore dummy flags. [ruby-core:59354] [Bug #9314]
Mon Dec 30 16:11:52 2013 WATANABE Hirofumi <eban@ruby-lang.org>
* tool/make-snapshot: needs CXXFLAGS. [ruby-core:59393][Bug #9320]

6
encoding.c
View file

@ -156,7 +156,7 @@ must_encindex(int index)
rb_raise(rb_eEncodingError, "encoding index out of bound: %d",
index);
}
if (ENC_TO_ENCINDEX(enc) != index) {
if (ENC_TO_ENCINDEX(enc) != (int)(index & ENC_INDEX_MASK)) {
rb_raise(rb_eEncodingError, "wrong encoding index %d for %s (expected %d)",
index, rb_enc_name(enc), ENC_TO_ENCINDEX(enc));
}
@ -592,7 +592,7 @@ rb_enc_from_index(int index)
if (!enc_table.list) {
rb_enc_init();
}
if (index < 0 || enc_table.count <= index) {
if (index < 0 || enc_table.count <= (index &= ENC_INDEX_MASK)) {
return 0;
}
return enc_table.list[index].enc;
@ -927,7 +927,7 @@ rb_obj_encoding(VALUE obj)
if (idx < 0) {
rb_raise(rb_eTypeError, "unknown encoding");
}
return rb_enc_from_encoding_index(idx);
return rb_enc_from_encoding_index(idx & ENC_INDEX_MASK);
}
int

11
test/ruby/test_transcode.rb
View file

@ -2080,4 +2080,15 @@ class TestTranscode < Test::Unit::TestCase
assert_equal "\ufffd", str.encode(invalid: :replace), bug8995
end
end
def test_valid_dummy_encoding
bug9314 = '[ruby-core:59354] [Bug #9314]'
assert_separately(%W[- -- #{bug9314}], <<-'end;')
bug = ARGV.shift
result = assert_nothing_raised(TypeError) {break "test".encode(Encoding::UTF_16)}
assert_equal("\xFE\xFF\x00t\x00e\x00s\x00t", result.b)
result = assert_nothing_raised(TypeError) {break "test".encode(Encoding::UTF_32)}
assert_equal("\x00\x00\xFE\xFF\x00\x00\x00t\x00\x00\x00e\x00\x00\x00s\x00\x00\x00t", result.b)
end;
end
end