* encoding.c (rb_locale_charmap): return nil if no locale information.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14394 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 1 deletions

diff --git a/ruby.c b/ruby.c
index f16ed424c..525a3cdb1 100644
--- a/ruby.c
+++ b/ruby.c
@@ -139,9 +139,12 @@ static rb_encoding *
 locale_encoding(void)
 {
     VALUE codeset = rb_locale_charmap(Qnil);
-    char *name = StringValueCStr(codeset);
+    char *name;
     int idx;
 
+    if (codeset == Qnil)
+        return rb_default_encoding();
+
     idx = rb_enc_find_index(name);
     if (idx < 0)
         return rb_default_encoding();