Backport #8054
open-uri と resolv-replace を同時にロードすると壊れる
Description
以下のように、open-uri と resolv-replace を同時にロードすると壊れます。
$ ruby -ropen-uri -rresolv-replace -ve 'open("http://www.ruby-lang.org/")'
ruby 2.0.0p0 (2013-02-24 revision 39474) [x86_64-darwin12.2.0]
/Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/resolv.rb:1176:in create': cannot interpret as DNS name: nil (ArgumentError)
generate_candidates'
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/resolv.rb:1022:in
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/resolv.rb:1047:in resolv'
each_resource'
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/resolv.rb:513:in
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/resolv.rb:406:in each_address'
block in each_address'
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/resolv.rb:115:in
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/resolv.rb:114:in each'
each_address'
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/resolv.rb:114:in
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/resolv.rb:92:in getaddress'
getaddress'
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/resolv.rb:43:in
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/resolv-replace.rb:10:in getaddress'
initialize'
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/resolv-replace.rb:22:in
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/net/http.rb:877:in open'
block in connect'
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/net/http.rb:877:in
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/timeout.rb:51:in timeout'
connect'
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/net/http.rb:876:in
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/net/http.rb:861:in do_start'
start'
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/net/http.rb:850:in
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/open-uri.rb:313:in open_http'
buffer_open'
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/open-uri.rb:708:in
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/open-uri.rb:210:in block in open_loop'
catch'
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/open-uri.rb:208:in
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/open-uri.rb:208:in open_loop'
open_uri'
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/open-uri.rb:149:in
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/open-uri.rb:688:in open'
open'
from /Users/kenta-murata/.rbenv/versions/2.0.0-p0/lib/ruby/2.0.0/open-uri.rb:34:in
from -e:1:in `'
Related issues
Updated by mrkn (Kenta Murata) almost 8 years ago
以下のような修正で正しく動いてるようです:
diff --git a/lib/resolv-replace.rb b/lib/resolv-replace.rb
index ff34f90..374c81a 100644
--- a/lib/resolv-replace.rb
+++ b/lib/resolv-replace.rb
@@ -18,9 +18,9 @@ class TCPSocket < IPSocket
# :stopdoc:
alias original_resolv_initialize initialize
# :startdoc:
- def initialize(host, serv, *rest)
- rest[0] = IPSocket.getaddress(rest[0]) unless rest.empty?
- original_resolv_initialize(IPSocket.getaddress(host), serv, *rest)
- def initialize(host, serv, local_host=nil, local_serv=nil)
- local_host = IPSocket.getaddress(local_host) if local_host
- original_resolv_initialize(IPSocket.getaddress(host), serv, local_host, local_serv) end end
Updated by mrkn (Kenta Murata) almost 8 years ago
Updated by akr (Akira Tanaka) almost 8 years ago
- Status changed from Open to Closed
- % Done changed from 0 to 100
This issue was solved with changeset r39725.
Kenta, thank you for reporting this issue.
Your contribution to Ruby is greatly appreciated.
May Ruby be with you.
- 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.
Updated by akr (Akira Tanaka) almost 8 years ago
2013/3/11 mrkn (Kenta Murata) muraken@gmail.com:
Issue #8054 has been updated by mrkn (Kenta Murata).
以下のような修正で正しく動いてるようです:
diff --git a/lib/resolv-replace.rb b/lib/resolv-replace.rb
index ff34f90..374c81a 100644
--- a/lib/resolv-replace.rb
+++ b/lib/resolv-replace.rb
@@ -18,9 +18,9 @@ class TCPSocket < IPSocket
# :stopdoc:
alias original_resolv_initialize initialize
# :startdoc:
- def initialize(host, serv, *rest)
- rest[0] = IPSocket.getaddress(rest[0]) unless rest.empty?
- original_resolv_initialize(IPSocket.getaddress(host), serv, *rest)
- def initialize(host, serv, local_host=nil, local_serv=nil)
- local_host = IPSocket.getaddress(local_host) if local_host
- original_resolv_initialize(IPSocket.getaddress(host), serv, local_host, local_serv) end end
引数の数を変えるのもなんなので、r39725 という感じで。
--
[田中 哲][たなか あきら][Tanaka Akira]
Updated by nagachika (Tomoyuki Chikanaga) almost 8 years ago
- Tracker changed from Bug to Backport
- Project changed from Ruby master to Backport200
- Category deleted (
lib) - Status changed from Closed to Assigned
- Assignee changed from akr (Akira Tanaka) to nagachika (Tomoyuki Chikanaga)
Updated by nagachika (Tomoyuki Chikanaga) almost 8 years ago
- Status changed from Assigned to Closed
This issue was solved with changeset r40089.
Kenta, thank you for reporting this issue.
Your contribution to Ruby is greatly appreciated.
May Ruby be with you.
merge revision(s) 39725: [Backport #8054]
* 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.