akr	2013-03-11 22:47:04 +0900 (Mon, 11 Mar 2013)

  New Revision: 39725

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39725

  Log:
    * lib/resolv-replace.rb (TCPSocket#initialize): resolve the 3rd
      argument only if non-nil value is given.
      [ruby-dev:47150] [ruby-trunk - Bug #8054] reported and analyzed by
      mrkn.

  Modified files:
    trunk/ChangeLog
    trunk/lib/resolv-replace.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39724)
+++ ChangeLog	(revision 39725)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Mon Mar 11 22:44:57 2013  Tanaka Akira  <akr@f...>
+
+	* lib/resolv-replace.rb (TCPSocket#initialize): resolve the 3rd
+	  argument only if non-nil value is given.
+	  [ruby-dev:47150] [ruby-trunk - Bug #8054] reported and analyzed by
+	  mrkn.
+
 Mon Mar 11 19:22:54 2013  NAKAMURA Usaku  <usa@r...>
 
 	* test/mkmf/base.rb: class name conflict.
Index: lib/resolv-replace.rb
===================================================================
--- lib/resolv-replace.rb	(revision 39724)
+++ lib/resolv-replace.rb	(revision 39725)
@@ -19,7 +19,7 @@ class TCPSocket < IPSocket https://github.com/ruby/ruby/blob/trunk/lib/resolv-replace.rb#L19
   alias original_resolv_initialize initialize
   # :startdoc:
   def initialize(host, serv, *rest)
-    rest[0] = IPSocket.getaddress(rest[0]) unless rest.empty?
+    rest[0] = IPSocket.getaddress(rest[0]) if rest[0]
     original_resolv_initialize(IPSocket.getaddress(host), serv, *rest)
   end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/