diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-11 13:47:04 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-03-11 13:47:04 +0000 |
| commit | b1f2effda85efd03bd4ad5c06e0aae5e14f3f864 (patch) | |
| tree | 3c01813cf2bb16182e96cccfeef95ec349367bcc | |
| parent | 79ea4d627ffc38c9754123c7535dc264dfc8e74e (diff) | |
| download | ruby-b1f2effda85efd03bd4ad5c06e0aae5e14f3f864.tar.gz | |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/resolv-replace.rb | 2 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Mon Mar 11 22:44:57 2013 Tanaka Akira <akr@fsij.org> + + * 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@ruby-lang.org> * test/mkmf/base.rb: class name conflict. diff --git a/lib/resolv-replace.rb b/lib/resolv-replace.rb index ff34f90db4..3e28a843fd 100644 --- a/lib/resolv-replace.rb +++ b/lib/resolv-replace.rb @@ -19,7 +19,7 @@ class TCPSocket < IPSocket 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 |