From 3c0ebab6f1598377fc652ec2ebe2411d19bd1bc8 Mon Sep 17 00:00:00 2001 From: naruse Date: Mon, 23 Jan 2012 09:19:10 +0000 Subject: merge revision(s) r34350: * encoding.c (rb_enc_compatible): fix segv on symbols. [ruby-core:42204] [Bug #5921] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34361 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_encoding.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'test') diff --git a/test/ruby/test_encoding.rb b/test/ruby/test_encoding.rb index eaad03d302..e0a27ef6b6 100644 --- a/test/ruby/test_encoding.rb +++ b/test/ruby/test_encoding.rb @@ -101,4 +101,10 @@ class TestEncoding < Test::Unit::TestCase 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 -- cgit v1.2.3