shyouhei	2009-01-27 17:29:38 +0900 (Tue, 27 Jan 2009)

  New Revision: 21800

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

  Log:
    merge revision(s) 19652:
    * marshal.c (marshal_dump): initializes dump_arg before any funcall.
      [ruby-dev:36648]

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/marshal.c
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 21799)
+++ ruby_1_8_6/ChangeLog	(revision 21800)
@@ -1,3 +1,8 @@
+Tue Jan 27 17:29:05 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* marshal.c (marshal_dump): initializes dump_arg before any funcall.
+	  [ruby-dev:36648]
+
 Tue Jan 27 15:16:05 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/socket/socket.c (host_str): numeric address should be unsigned.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 21799)
+++ ruby_1_8_6/version.h	(revision 21800)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-01-27"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20090127
-#define RUBY_PATCHLEVEL 311
+#define RUBY_PATCHLEVEL 312
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/marshal.c
===================================================================
--- ruby_1_8_6/marshal.c	(revision 21799)
+++ ruby_1_8_6/marshal.c	(revision 21800)
@@ -776,8 +776,12 @@
 	else port = a1;
     }
     arg.dest = 0;
+    arg.symbols = st_init_numtable();
+    arg.data    = st_init_numtable();
+    arg.taint   = Qfalse;
     arg.str = rb_str_buf_new(0);
     RBASIC(arg.str)->klass = 0;
+    arg.wrapper = Data_Wrap_Struct(rb_cData, mark_dump_arg, 0, &arg);
     if (!NIL_P(port)) {
 	if (!rb_respond_to(port, s_write)) {
 	  type_error:
@@ -793,10 +797,6 @@
 	port = arg.str;
     }
 
-    arg.symbols = st_init_numtable();
-    arg.data    = st_init_numtable();
-    arg.taint   = Qfalse;
-    arg.wrapper = Data_Wrap_Struct(rb_cData, mark_dump_arg, 0, &arg);
     c_arg.obj   = obj;
     c_arg.arg   = &arg;
     c_arg.limit = limit;

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