aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-13 07:08:56 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-13 07:08:56 +0000
commit87f6de3e189195392afa55f1d2d8a095ee3344f3 (patch)
treead30515a17499b10969bc898dfefee5ab941e908
parente53990e4bdbf1fc5aa36e5f2150d118f6e324106 (diff)
downloadruby-87f6de3e189195392afa55f1d2d8a095ee3344f3.tar.gz
* encoding.c (default_external): endless recursion during
loading a locale encoding on some locale. fixed by Nobuyuki Nakada. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20721 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--encoding.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 143ed7be4e..3d8b5f713d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Dec 13 16:04:48 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
+
+ * encoding.c (default_external): endless recursion during
+ loading a locale encoding on some locale.
+ fixed by Nobuyuki Nakada.
+
Sat Dec 13 15:55:37 2008 TAKAO Kouji <kouji@takao7.net>
* ruby.c (process_options): fixed default_internal is nil.
diff --git a/encoding.c b/encoding.c
index f802850f3b..eca4140a02 100644
--- a/encoding.c
+++ b/encoding.c
@@ -1066,7 +1066,7 @@ enc_set_default_encoding(struct default_encoding *def, VALUE encoding,
return overridden;
}
-static struct default_encoding default_external = {-2};
+static struct default_encoding default_external = {0};
rb_encoding *
rb_default_external_encoding(void)