diff options
-rw-r--r-- | encoding.c | 3 | ||||
-rw-r--r-- | test/ruby/test_encoding.rb | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/encoding.c b/encoding.c index df3d65cd48..b1afc87bd2 100644 --- a/encoding.c +++ b/encoding.c @@ -747,6 +747,9 @@ rb_enc_get_index(VALUE obj) obj = rb_id2str(SYM2ID(obj)); } switch (BUILTIN_TYPE(obj)) { + case T_SYMBOL: + obj = RSYMBOL(obj)->fstr; + /* fall through */ as_default: default: case T_STRING: diff --git a/test/ruby/test_encoding.rb b/test/ruby/test_encoding.rb index 9a780a64c5..e3b15eb277 100644 --- a/test/ruby/test_encoding.rb +++ b/test/ruby/test_encoding.rb @@ -110,6 +110,7 @@ class TestEncoding < Test::Unit::TestCase bin = "\xff".force_encoding(Encoding::ASCII_8BIT).to_sym asc = "b".force_encoding(Encoding::ASCII_8BIT) assert_equal(Encoding::ASCII_8BIT, Encoding.compatible?(bin, asc)) + assert_equal(Encoding::UTF_8, Encoding.compatible?("\u{3042}".to_sym, ua.to_sym)) end def test_errinfo_after_autoload |