nagachika	2015-03-31 00:49:32 +0900 (Tue, 31 Mar 2015)

  New Revision: 50132

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

  Log:
    merge revision(s) r48999,r49484: [Backport #10646]
    
    * gc.c (wmap_final_func): fix memory size shortage when realloc wmap.
      Fix SEGV during finilize of WeakRef on Solaris (though the SEGV
      could occur on all OS/platforms). [ruby-dev:48779] [Bug #10646]
      Fix SEGV during finalize of WeakRef on Solaris (though the SEGV

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/gc.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 50131)
+++ ruby_2_1/ChangeLog	(revision 50132)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Tue Mar 31 00:49:23 2015  Naohisa Goto  <ngotogenome@g...>
+
+	* gc.c (wmap_final_func): fix memory size shortage when realloc wmap.
+	  Fix SEGV during finalize of WeakRef on Solaris (though the SEGV
+	  could occur on all OS/platforms). [ruby-dev:48779] [Bug #10646]
+
 Tue Mar 31 00:38:14 2015  Seiei Higa  <hanachin@g...>
 
 	* vm_method.c (rb_method_entry): if no super class, no original
Index: ruby_2_1/gc.c
===================================================================
--- ruby_2_1/gc.c	(revision 50131)
+++ ruby_2_1/gc.c	(revision 50132)
@@ -6413,7 +6413,7 @@ wmap_final_func(st_data_t *key, st_data_ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/gc.c#L6413
 	return ST_DELETE;
     }
     if (j < i) {
-	ptr = ruby_sized_xrealloc2(ptr, j, sizeof(VALUE), i);
+	ptr = ruby_sized_xrealloc2(ptr, j + 1, sizeof(VALUE), i);
 	ptr[0] = j;
 	*value = (st_data_t)ptr;
     }
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 50131)
+++ ruby_2_1/version.h	(revision 50132)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2015-03-31"
-#define RUBY_PATCHLEVEL 327
+#define RUBY_PATCHLEVEL 328
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r48999,49484


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