summaryrefslogtreecommitdiff
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
commitff8d74379305a1e00658e4a9eacb3244a263e550 (patch)
tree71b12dff46b0ff47270f092d7185b4978be148ae
parent24174a457392acf2bff8c19751f0e4fb8e70a644 (diff)
* 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/branches/ruby_1_9_1@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 a52cf03131..6cee615d33 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 14:24:38 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* test/ruby/enc/test_utf16.rb: feature changed in r20626.
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)