summaryrefslogtreecommitdiffstats
path: root/encoding.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-19 05:08:49 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-03-19 05:08:49 +0000
commit1a328da16a7eb5f0e5b5841df6b880c99893b48e (patch)
treeb4500c43738f5bfea5ea25637faaa0ffb086c99f /encoding.c
parent1db7f07df2b314c5e502cb21ebebe2eb30803f01 (diff)
downloadruby-1a328da16a7eb5f0e5b5841df6b880c99893b48e.tar.gz
ruby-1a328da16a7eb5f0e5b5841df6b880c99893b48e.tar.xz
ruby-1a328da16a7eb5f0e5b5841df6b880c99893b48e.zip
* encoding.c (enc_check_encoding): should not load autoloaded encoding
directly, instead use rb_enc_find_index() which deal with alias and replica. [ruby-core:15957] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15798 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
-rw-r--r--encoding.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/encoding.c b/encoding.c
index c7881a8ed..9759da79a 100644
--- a/encoding.c
+++ b/encoding.c
@@ -108,7 +108,7 @@ enc_check_encoding(VALUE obj)
if (rb_enc_from_index(index) != enc)
return -1;
if (enc_autoload_p(enc)) {
- index = load_encoding(enc->name);
+ index = rb_enc_find_index(enc->name);
}
return index;
}