diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-25 08:39:10 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-25 08:39:10 +0000 |
commit | 74051762fe4072dc96d64f00ee53dd641c3fd687 (patch) | |
tree | 099d9851956d2a57c374686a283daa0dacb9c95d | |
parent | fad08eba19681fa423bfd26c98efe84b68af0dbe (diff) | |
parent | 364be8e7c214106f4c6e3f9f6cb75a54addb237f (diff) |
add tag v2_2_0
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/tags/v2_2_0@49002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | configure.in | 3 | ||||
-rw-r--r-- | gc.c | 2 |
3 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,14 @@ +Thu Dec 25 17:37:47 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:31:51 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (NET_LUID): include winsock2.h instead of windows.h. + patch by Jon Forums in [ruby-core:67125]. [Bug #10640] + Thu Dec 25 16:01:19 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * file.c (rb_file_expand_path_internal): drop characters ignored diff --git a/configure.in b/configure.in index ae08fa0956..375ef5533c 100644 --- a/configure.in +++ b/configure.in @@ -1102,8 +1102,7 @@ main() ac_cv_func_malloc_usable_size=no { test "$target_cpu" = x64 && ac_cv_func___builtin_setjmp=no; } AC_CHECK_TYPE([NET_LUID], [], [], - [@%:@include <windows.h> - @%:@include <ifdef.h> + [@%:@include <winsock2.h> @%:@include <iphlpapi.h>]) if test x"$ac_cv_type_NET_LUID" = xyes; then AC_DEFINE(HAVE_TYPE_NET_LUID, 1) @@ -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; } |