naruse	2014-12-25 17:38:14 +0900 (Thu, 25 Dec 2014)

  New Revision: 49001

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

  Log:
    merge revision(s) 48999: [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]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/gc.c
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 49000)
+++ ruby_2_2/ChangeLog	(revision 49001)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Thu Dec 25 17:37:47 2014  Naohisa Goto  <ngotogenome@g...>
+
+	* 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]
+
 Thu Dec 25 17:31:51 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* configure.in (NET_LUID): include winsock2.h instead of windows.h.
Index: ruby_2_2/gc.c
===================================================================
--- ruby_2_2/gc.c	(revision 49000)
+++ ruby_2_2/gc.c	(revision 49001)
@@ -7672,7 +7672,7 @@ wmap_final_func(st_data_t *key, st_data_ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/gc.c#L7672
 	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;
     }

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r48999


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