From 4fd53e476e493630a140edc085c71f2670d74942 Mon Sep 17 00:00:00 2001 From: akr Date: Fri, 13 Dec 2013 16:11:12 +0000 Subject: * ext/socket/lib/socket.rb: Don't test $! in "ensure" clause because it may be set before the body. Reported by ko1 and mrkn. [ruby-core:59088] [Bug #9247] * lib/cgi/core.rb: Ditto. * lib/drb/ssl.rb: Ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44184 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++ ext/socket/lib/socket.rb | 79 ++++++++++++++++++++++++++++------------------ lib/cgi/core.rb | 5 +-- lib/drb/ssl.rb | 5 +-- test/socket/test_socket.rb | 71 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 136 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index 898d2c4c4b..a3dfdb2802 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Sat Dec 14 01:05:46 2013 Tanaka Akira + + * ext/socket/lib/socket.rb: Don't test $! in "ensure" clause because + it may be set before the body. + Reported by ko1 and mrkn. [ruby-core:59088] [Bug #9247] + + * lib/cgi/core.rb: Ditto. + + * lib/drb/ssl.rb: Ditto. + Sat Dec 14 00:34:31 2013 Naohisa Goto * internal.h (ruby_sized_xrealloc2): fix typo introduced in r44117, diff --git a/ext/socket/lib/socket.rb b/ext/socket/lib/socket.rb index 07c9c4e6ba..2cd7aeadf9 100644 --- a/ext/socket/lib/socket.rb +++ b/ext/socket/lib/socket.rb @@ -64,13 +64,18 @@ class Addrinfo else sock.connect(self) end - if block_given? + rescue Exception + sock.close + raise + end + if block_given? + begin yield sock - else - sock + ensure + sock.close if !sock.closed? end - ensure - sock.close if !sock.closed? && (block_given? || $!) + else + sock end end private :connect_internal @@ -177,13 +182,18 @@ class Addrinfo sock.ipv6only! if self.ipv6? sock.setsockopt(:SOCKET, :REUSEADDR, 1) sock.bind(self) - if block_given? + rescue Exception + sock.close + raise + end + if block_given? + begin yield sock - else - sock + ensure + sock.close if !sock.closed? end - ensure - sock.close if !sock.closed? && (block_given? || $!) + else + sock end end @@ -195,13 +205,18 @@ class Addrinfo sock.setsockopt(:SOCKET, :REUSEADDR, 1) sock.bind(self) sock.listen(backlog) - if block_given? + rescue Exception + sock.close + raise + end + if block_given? + begin yield sock - else - sock + ensure + sock.close if !sock.closed? end - ensure - sock.close if !sock.closed? && (block_given? || $!) + else + sock end end @@ -348,8 +363,9 @@ class Socket < BasicSocket # :stopdoc: def self.ip_sockets_port0(ai_list, reuseaddr) + sockets = [] begin - sockets = [] + sockets.clear port = nil ai_list.each {|ai| begin @@ -370,14 +386,13 @@ class Socket < BasicSocket end } rescue Errno::EADDRINUSE - sockets.each {|s| - s.close - } + sockets.each {|s| s.close } retry + rescue Exception + sockets.each {|s| s.close } + raise end sockets - ensure - sockets.each {|s| s.close if !s.closed? } if $! end class << self private :ip_sockets_port0 @@ -386,12 +401,15 @@ class Socket < BasicSocket def self.tcp_server_sockets_port0(host) ai_list = Addrinfo.getaddrinfo(host, 0, nil, :STREAM, nil, Socket::AI_PASSIVE) sockets = ip_sockets_port0(ai_list, true) - sockets.each {|s| - s.listen(Socket::SOMAXCONN) - } + begin + sockets.each {|s| + s.listen(Socket::SOMAXCONN) + } + rescue Exception + sockets.each {|s| s.close } + raise + end sockets - ensure - sockets.each {|s| s.close if !s.closed? } if $! && sockets end class << self private :tcp_server_sockets_port0 @@ -435,9 +453,9 @@ class Socket < BasicSocket if port == 0 sockets = tcp_server_sockets_port0(host) else + last_error = nil + sockets = [] begin - last_error = nil - sockets = [] Addrinfo.foreach(host, port, nil, :STREAM, nil, Socket::AI_PASSIVE) {|ai| begin s = ai.listen @@ -450,8 +468,9 @@ class Socket < BasicSocket if sockets.empty? raise last_error end - ensure - sockets.each {|s| s.close if !s.closed? } if $! + rescue Exception + sockets.each {|s| s.close } + raise end end if block_given? diff --git a/lib/cgi/core.rb b/lib/cgi/core.rb index 662e04c9b7..241f817278 100644 --- a/lib/cgi/core.rb +++ b/lib/cgi/core.rb @@ -574,14 +574,15 @@ class CGI raise EOFError, "bad boundary end of body part" unless boundary_end =~ /--/ params.default = [] params - ensure - if $! && tempfiles + rescue Exception + if tempfiles tempfiles.each {|t| if t.path t.unlink end } end + raise end # read_multipart private :read_multipart def create_body(is_large) #:nodoc: diff --git a/lib/drb/ssl.rb b/lib/drb/ssl.rb index 82a9c7ce90..78c0038abc 100644 --- a/lib/drb/ssl.rb +++ b/lib/drb/ssl.rb @@ -328,8 +328,9 @@ module DRb end begin ssl = @config.accept(soc) - ensure - soc.close if $! + rescue Exception + soc.close + raise end self.class.new(uri, ssl, @config, true) rescue OpenSSL::SSL::SSLError diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb index 590a7abed7..5d2d0aee26 100644 --- a/test/socket/test_socket.rb +++ b/test/socket/test_socket.rb @@ -575,4 +575,75 @@ class TestSocket < Test::Unit::TestCase assert_instance_of(Socket::Ifaddr, ifaddr) } end + + def test_connect_in_rescue + serv = Addrinfo.tcp(nil, 0).listen + addr = serv.connect_address + begin + raise "dummy error" + rescue + s = addr.connect + assert(!s.closed?) + end + ensure + serv.close if serv && !serv.closed? + s.close if s && !s.closed? + end + + def test_bind_in_rescue + begin + raise "dummy error" + rescue + s = Addrinfo.tcp(nil, 0).bind + assert(!s.closed?) + end + ensure + s.close if s && !s.closed? + end + + def test_listen_in_rescue + begin + raise "dummy error" + rescue + s = Addrinfo.tcp(nil, 0).listen + assert(!s.closed?) + end + ensure + s.close if s && !s.closed? + end + + def test_udp_server_sockets_in_rescue + begin + raise "dummy error" + rescue + ss = Socket.udp_server_sockets(0) + ss.each {|s| + assert(!s.closed?) + } + end + ensure + if ss + ss.each {|s| + s.close if !s.closed? + } + end + end + + def test_tcp_server_sockets_in_rescue + begin + raise "dummy error" + rescue + ss = Socket.tcp_server_sockets(0) + ss.each {|s| + assert(!s.closed?) + } + end + ensure + if ss + ss.each {|s| + s.close if !s.closed? + } + end + end + end if defined?(Socket) -- cgit v1.2.3