From e04046515389ba4d019a13db33de198b85480b00 Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 15 Sep 2018 16:27:06 +0000 Subject: encoding.c: check external encoding * encoding.c (rb_enc_get_index): external encoding may not be Data object. [ruby-core:89016] [Bug #15122] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64753 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- encoding.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'encoding.c') diff --git a/encoding.c b/encoding.c index d130eb2612..10a0ab0371 100644 --- a/encoding.c +++ b/encoding.c @@ -803,7 +803,7 @@ rb_enc_get_index(VALUE obj) if (NIL_P(tmp)) { tmp = rb_funcallv(obj, rb_intern("external_encoding"), 0, 0); } - if (is_data_encoding(tmp)) { + if (is_obj_encoding(tmp)) { i = enc_check_encoding(tmp); } break; -- cgit v1.2.3