Merge pull request #27 from ruby/fix-connection-leak-when-thread-inte…

…rrupted Fix connection leak when the thread is interrupted by Thread#kill etc.
ruby · Dec 15, 2023 · 6be2f7e · 6be2f7e
2 parents 7ff7ca2 + a72fd9f
commit 6be2f7e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
@@ -563,6 +563,7 @@ def makepasv # :nodoc:
     def transfercmd(cmd, rest_offset = nil) # :nodoc:
       if @passive
         host, port = makepasv
+        succeeded = false
         begin
           conn = open_socket(host, port)
           if @resume and rest_offset
@@ -577,9 +578,9 @@ def transfercmd(cmd, rest_offset = nil) # :nodoc:
           if !resp.start_with?("1")
             raise FTPReplyError, resp
           end
-        rescue Exception
-          conn&.close
-          raise
+          succeeded = true
+        ensure
+          conn&.close if !succeeded
         end
       else
         sock = makeport