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

ruby-changes:22817

From: nobu <ko1@a...>
Date: Fri, 2 Mar 2012 10:53:28 +0900 (JST)
Subject: [ruby-changes:22817] nobu:r34866 (ruby_1_8): * marshal.c (mark_dump_arg): mark destination string. patch by

nobu	2012-03-02 10:53:11 +0900 (Fri, 02 Mar 2012)

  New Revision: 34866

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

  Log:
    * marshal.c (mark_dump_arg): mark destination string.  patch by
      Vit Ondruch.  [Bug #4339]
    * marshal.c (clear_dump_arg, clear_load_arg): clean up also data
      tables as same as symbols tables.

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

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 34865)
+++ ruby_1_8/ChangeLog	(revision 34866)
@@ -1,3 +1,11 @@
+Fri Mar  2 10:53:01 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* marshal.c (mark_dump_arg): mark destination string.  patch by
+	  Vit Ondruch.  [Bug #4339]
+
+	* marshal.c (clear_dump_arg, clear_load_arg): clean up also data
+	  tables as same as symbols tables.
+
 Wed Feb  8 14:06:59 2012  Hiroshi Nakamura  <nahi@r...>
 
 	* ext/openssl/ossl_ssl.c: Add SSL constants and allow to unset SSL
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 34865)
+++ ruby_1_8/version.h	(revision 34866)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2012-02-08"
+#define RUBY_RELEASE_DATE "2012-03-02"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20120208
+#define RUBY_RELEASE_CODE 20120302
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2012
-#define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 8
+#define RUBY_RELEASE_MONTH 3
+#define RUBY_RELEASE_DAY 2
 
 #define NO_STRING_LITERAL_CONCATENATION 1
 #ifdef RUBY_EXTERN
Index: ruby_1_8/marshal.c
===================================================================
--- ruby_1_8/marshal.c	(revision 34865)
+++ ruby_1_8/marshal.c	(revision 34866)
@@ -118,6 +118,7 @@
     if (!p->symbols)
         return;
     rb_mark_set(p->data);
+    rb_gc_mark(p->str);
 }
 
 static void
@@ -716,6 +717,7 @@
     st_free_table(arg->symbols);
     arg->symbols = 0;
     st_free_table(arg->data);
+    arg->data = 0;
     if (arg->taint) {
 	OBJ_TAINT(arg->str);
     }
@@ -1428,6 +1430,7 @@
     st_free_table(arg->symbols);
     arg->symbols = 0;
     st_free_table(arg->data);
+    arg->data = 0;
 }
 
 /*

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

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