matz	2008-10-14 23:05:11 +0900 (Tue, 14 Oct 2008)

  New Revision: 19784

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

  Log:
    * transcode.c (str_transcode0): should not raise error when
      default_internal is not set.  [ruby-core:19309]

  Modified files:
    trunk/ChangeLog
    trunk/transcode.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19783)
+++ ChangeLog	(revision 19784)
@@ -45,6 +45,11 @@
 	* test/ruby/test_variable.rb (TestVariable#test_variable): add
 	  a test of [ruby-dev:36698].
 
+Tue Oct 14 11:14:29 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* transcode.c (str_transcode0): should not raise error when
+	  default_internal is not set.  [ruby-core:19309]
+
 Tue Oct 14 11:14:26 2008  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* lib/net/pop.rb: check for invalid APOP timestamp. (CVE-2007-1558)
Index: transcode.c
===================================================================
--- transcode.c	(revision 19783)
+++ transcode.c	(revision 19784)
@@ -2455,7 +2455,7 @@
     if (argc == 0) {
 	arg1 = rb_enc_default_internal();
 	if (NIL_P(arg1)) {
-	    rb_raise(rb_eArgError, "Encoding.default_internal is not specified");
+	    return -1;
 	}
     }
     else {

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