From e358e2f89964ed1950d64d040218cd80add26b72 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 21 May 2015 04:26:32 +0000 Subject: merge revision(s) 50187,50202: [Backport #11051] * ext/socket/raddrinfo.c (addrinfo_mload): fix memory leak of addrinfo. [ruby-dev:48923] [Bug #11051] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/socket/raddrinfo.c | 1 + test/socket/test_addrinfo.rb | 12 ++++++++++++ version.h | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 53ee13651f..1fefa791e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu May 21 13:23:44 2015 Masahiro Tomita + + * ext/socket/raddrinfo.c (addrinfo_mload): fix memory leak of + addrinfo. [ruby-dev:48923] [Bug #11051] + Thu May 21 13:19:52 2015 Kenta Murata * bigdecimal: conform to ruby's license. [ruby-core:68466] [Bug #10952] diff --git a/ext/socket/raddrinfo.c b/ext/socket/raddrinfo.c index e4cb9c379f..66b5976002 100644 --- a/ext/socket/raddrinfo.c +++ b/ext/socket/raddrinfo.c @@ -1644,6 +1644,7 @@ addrinfo_mload(VALUE self, VALUE ary) len = res->ai->ai_addrlen; memcpy(&ss, res->ai->ai_addr, res->ai->ai_addrlen); + rb_freeaddrinfo(res); break; } } diff --git a/test/socket/test_addrinfo.rb b/test/socket/test_addrinfo.rb index 61b889ed26..bf1f35d058 100644 --- a/test/socket/test_addrinfo.rb +++ b/test/socket/test_addrinfo.rb @@ -4,6 +4,7 @@ rescue LoadError end require "test/unit" +require_relative "../ruby/envutil" class TestSocketAddrinfo < Test::Unit::TestCase HAS_UNIXSOCKET = defined?(UNIXSocket) && /cygwin/ !~ RUBY_PLATFORM @@ -468,6 +469,17 @@ class TestSocketAddrinfo < Test::Unit::TestCase assert_equal(ai1.canonname, ai2.canonname) end + def test_marshal_memory_leak + bug11051 = '[ruby-dev:48923] [Bug #11051]' + assert_no_memory_leak(%w[-rsocket], <<-PREP, <<-CODE, bug11051, rss: true) + d = Marshal.dump(Addrinfo.tcp("127.0.0.1", 80)) + 1000.times {Marshal.load(d)} + PREP + GC.start + 20_000.times {Marshal.load(d)} + CODE + end + if Socket.const_defined?("AF_INET6") && Socket::AF_INET6.is_a?(Integer) def test_addrinfo_new_inet6 diff --git a/version.h b/version.h index 9a46309250..35681d7644 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.7" #define RUBY_RELEASE_DATE "2015-05-21" -#define RUBY_PATCHLEVEL 348 +#define RUBY_PATCHLEVEL 349 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 5 -- cgit v1.2.3