diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-03-19 05:08:49 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-03-19 05:08:49 +0000 |
| commit | 1a328da16a7eb5f0e5b5841df6b880c99893b48e (patch) | |
| tree | b4500c43738f5bfea5ea25637faaa0ffb086c99f | |
| parent | 1db7f07df2b314c5e502cb21ebebe2eb30803f01 (diff) | |
| download | ruby-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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | encoding.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Wed Mar 19 14:08:47 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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] + Wed Mar 19 11:49:47 2008 NAKAMURA Usaku <usa@ruby-lang.org> * regint.h (include): include ruby.h instead of defines.h and config.h. 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; } |