[前][次][番号順一覧][スレッド一覧]

ruby-changes:7119

From: akr <ko1@a...>
Date: Fri, 15 Aug 2008 09:34:31 +0900 (JST)
Subject: [ruby-changes:7119] Ruby:r18637 (trunk): * transcode.c (conv_init): check empty name.

akr	2008-08-15 09:34:16 +0900 (Fri, 15 Aug 2008)

  New Revision: 18637

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

  Log:
    * transcode.c (conv_init): check empty name.

  Modified files:
    trunk/ChangeLog
    trunk/transcode.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18636)
+++ ChangeLog	(revision 18637)
@@ -1,3 +1,7 @@
+Fri Aug 15 09:33:48 2008  Tanaka Akira  <akr@f...>
+
+	* transcode.c (conv_init): check empty name.
+
 Fri Aug 15 09:03:54 2008  Tanaka Akira  <akr@f...>
 
 	* transcode.c (econv_init): don't create dummy encoding if
Index: transcode.c
===================================================================
--- transcode.c	(revision 18636)
+++ transcode.c	(revision 18637)
@@ -1497,10 +1497,12 @@
         rb_raise(rb_eArgError, "encoding convewrter not supported (from %s to %s)", sname, dname);
     }
 
-    if (!senc)
-        senc = make_dummy_encoding(sname);
-    if (!denc)
-        denc = make_dummy_encoding(dname);
+    if (*sname && *dname) { /* check "" to "universal_newline" */
+        if (!senc)
+            senc = make_dummy_encoding(sname);
+        if (!denc)
+            denc = make_dummy_encoding(dname);
+    }
 
     ec->source_encoding = senc;
     ec->destination_encoding = denc;

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

[前][次][番号順一覧][スレッド一覧]