From b1c07ee240f4fad7f498bd7910be027d47e4894b Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 31 Oct 2008 02:35:41 +0000 Subject: [PATCH] * encoding.c (rb_enc_set_default_internal): no alias "internal" if defalt internal is not set. [ruby-dev:37000] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ encoding.c | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8954cbe13b..be85a65f60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Oct 31 11:35:38 2008 Nobuyoshi Nakada + + * encoding.c (rb_enc_set_default_internal): no alias "internal" if + defalt internal is not set. [ruby-dev:37000] + Fri Oct 31 08:16:14 2008 Nobuyoshi Nakada * ruby.c (process_options): delays setting safe level. diff --git a/encoding.c b/encoding.c index e9fcbfcb3e..7b7d301133 100644 --- a/encoding.c +++ b/encoding.c @@ -1101,8 +1101,13 @@ rb_enc_set_default_internal(VALUE encoding) if (default_internal_index != -2) /* Already set */ return; - default_internal_index = encoding == Qnil ? - -1 :rb_enc_to_index(rb_to_encoding(encoding)); + if (NIL_P(encoding)) { + default_internal_index = -1; + default_internal = 0; + return; + } + + default_internal_index = rb_enc_to_index(rb_to_encoding(encoding)); /* Convert US-ASCII => UTF-8 */ if (default_internal_index == rb_usascii_encindex()) default_internal_index = rb_utf8_encindex();