diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-08 00:40:44 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-08 00:40:44 +0000 |
| commit | b7f40d86af3e98c4481caf1014ba5423901d4580 (patch) | |
| tree | 371712cf34fa89060354e2a5891dea3f60a99485 /test | |
| parent | 911e4ee15a2742d94770e6f55337f261cf37489a (diff) | |
merge revision(s) 33201,33249,33328: [Backport #5564]
* encoding.c (load_encoding): predefined encoding names are safe.
[ruby-dev:44469] [Bug #5279]
* transcode.c (load_transcoder_entry): ditto.
* encoding.c (require_enc): reject only loading from untrusted
load paths. [ruby-dev:44541] [Bug #5279]
* transcode.c (load_transcoder_entry): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34465 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/ruby/test_encoding.rb | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/test/ruby/test_encoding.rb b/test/ruby/test_encoding.rb index e0a27ef6b6..6a406ae237 100644 --- a/test/ruby/test_encoding.rb +++ b/test/ruby/test_encoding.rb @@ -50,6 +50,9 @@ class TestEncoding < Test::Unit::TestCase exit Encoding.find("filesystem") == Encoding::EUC_JP EOS end + + bug5150 = '[ruby-dev:44327]' + assert_raise(TypeError, bug5150) {Encoding.find(1)} end def test_replicate @@ -96,15 +99,4 @@ class TestEncoding < Test::Unit::TestCase str2 = Marshal.load(Marshal.dump(str2)) assert_equal(str, str2, '[ruby-dev:38596]') end - - def test_unsafe - bug5279 = '[ruby-dev:44469]' - assert_ruby_status([], '$SAFE=3; "a".encode("utf-16be")', bug5279) - end - - def test_compatible_p - ua = "abc".force_encoding(Encoding::UTF_8) - assert_equal(Encoding::UTF_8, Encoding.compatible?(ua, :abc)) - assert_equal(nil, Encoding.compatible?(ua, 1)) - end end |