nobu	2009-06-21 10:46:37 +0900 (Sun, 21 Jun 2009)

  New Revision: 23773

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23773

  Log:
    * transcode.c (enc_arg): default interanl encoding may not be set.
      [ruby-core:23932]

  Modified files:
    trunk/ChangeLog
    trunk/transcode.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23772)
+++ ChangeLog	(revision 23773)
@@ -1,3 +1,8 @@
+Sun Jun 21 10:46:32 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* transcode.c (enc_arg): default interanl encoding may not be set.
+	  [ruby-core:23932]
+
 Sat Jun 20 21:11:43 2009  Tadayoshi Funaba  <tadf@d...>
 
 	* numeric.c (num_div): don't use num_floor which is actually
Index: transcode.c
===================================================================
--- transcode.c	(revision 23772)
+++ transcode.c	(revision 23773)
@@ -2470,13 +2470,13 @@
     int encidx;
     VALUE encval;
 
-    if ((encidx = rb_to_encoding_index(encval = *arg)) < 0) {
+    if (((encidx = rb_to_encoding_index(encval = *arg)) < 0) ||
+	!(enc = rb_enc_from_index(encidx))) {
 	enc = NULL;
 	encidx = 0;
 	n = StringValueCStr(*arg);
     }
     else {
-	enc = rb_enc_from_index(encidx);
 	n = rb_enc_name(enc);
     }
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/