shyouhei	2008-06-15 22:04:24 +0900 (Sun, 15 Jun 2008)

  New Revision: 17236

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

  Log:
    merge revision(s) 15965:
    * marshal.c (w_object): add volatile to avoid potential GC bug.  a
      patch from Tomoyuki Chikanaga <chikanag at nippon-control-system.co.jp>
      in [ruby-dev:34311].


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/marshal.c?r1=17236&r2=17235&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17236&r2=17235&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17236&r2=17235&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17235)
+++ ruby_1_8_5/ChangeLog	(revision 17236)
@@ -1,3 +1,9 @@
+Sun Jun 15 22:03:36 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* marshal.c (w_object): add volatile to avoid potential GC bug.  a
+	  patch from Tomoyuki Chikanaga <chikanag at nippon-control-system.co.jp>
+	  in [ruby-dev:34311].
+
 Sun Jun 15 21:57:19 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* re.c (rb_reg_quote): should always copy the quoting string.
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17235)
+++ ruby_1_8_5/version.h	(revision 17236)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-15"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 192
+#define RUBY_PATCHLEVEL 193
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/marshal.c
===================================================================
--- ruby_1_8_5/marshal.c	(revision 17235)
+++ ruby_1_8_5/marshal.c	(revision 17236)
@@ -502,7 +502,7 @@
 
 	st_add_direct(arg->data, obj, arg->data->num_entries);
 	if (rb_respond_to(obj, s_mdump)) {
-	    VALUE v;
+	    volatile VALUE v;
 
 	    v = rb_funcall(obj, s_mdump, 0, 0);
 	    w_class(TYPE_USRMARSHAL, obj, arg, Qfalse);

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