* gc.c (wmap_final_func): fix memory size shortage when realloc wmap.

ngoto · ngoto · commit 7632a82d5750 · 2014-12-25T08:33:41.000Z
Fix SEGV during finilize of WeakRef on Solaris (though the SEGV could occur on all OS/platforms). [ruby-dev:48779] [Bug #10646] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48999 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Dec 25 17:30:40 2014  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* 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:27:06 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (NET_LUID): include winsock2.h instead of windows.h.
diff --git a/gc.c b/gc.c
@@ -7672,7 +7672,7 @@ wmap_final_func(st_data_t *key, st_data_t *value, st_data_t arg, int existing)
 	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;
     }

Original file line number	Diff line number	Diff line change
`@@ -7672,7 +7672,7 @@ wmap_final_func(st_data_t key, st_data_t value, st_data_t arg, int existing)`
`7672`	`7672`	`return ST_DELETE;`
`7673`	`7673`	`}`
`7674`	`7674`	`if (j < i) {`
`7675`		`- ptr = ruby_sized_xrealloc2(ptr, j, sizeof(VALUE), i);`
	`7675`	`+ ptr = ruby_sized_xrealloc2(ptr, j + 1, sizeof(VALUE), i);`
`7676`	`7676`	`ptr[0] = j;`
`7677`	`7677`	`*value = (st_data_t)ptr;`
`7678`	`7678`	`}`