* lib/uri/rfc3986_parser.rb: raise URI::InvalidURIError when

  uri doesn't respond to #to_str. [ruby-core:64453] [Bug #10150]

* test/uri/test_parser.rb: test for above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47721 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 18 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index aa8443b195..26173d807c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Sep 26 15:03:19 2014  Masaki Matsushita <glass.saga@gmail.com>
+
+	* lib/uri/rfc3986_parser.rb: raise URI::InvalidURIError when
+	  uri doesn't respond to #to_str. [ruby-core:64453] [Bug #10150]
+
+	* test/uri/test_parser.rb: test for above.
+
 Sat Sep 27 10:31:48 2014  Kazuki Tsujimoto  <kazuki@callcc.net>
 
 	* gems/bundled_gems: upgraded to power_assert 0.1.4.
diff --git a/lib/uri/rfc3986_parser.rb b/lib/uri/rfc3986_parser.rb
index 965601c7b3..e23a3161f1 100644
--- a/lib/uri/rfc3986_parser.rb
+++ b/lib/uri/rfc3986_parser.rb
@@ -6,7 +6,11 @@ module URI
     RFC3986_relative_ref = /\A(?<relative-ref>(?<relative-part>\/\/(?<authority>(?:(?<userinfo>(?:%\h\h|[!$&-.0-;=A-Z_a-z~])*)@)?(?<host>(?<IP-literal>\[(?<IPv6address>(?:\h{1,4}:){6}(?<ls32>\h{1,4}:\h{1,4}|(?<IPv4address>(?<dec-octet>[1-9]\d|1\d{2}|2[0-4]\d|25[0-5]|\d)\.\g<dec-octet>\.\g<dec-octet>\.\g<dec-octet>))|::(?:\h{1,4}:){5}\g<ls32>|\h{1,4}?::(?:\h{1,4}:){4}\g<ls32>|(?:(?:\h{1,4}:){,1}\h{1,4})?::(?:\h{1,4}:){3}\g<ls32>|(?:(?:\h{1,4}:){,2}\h{1,4})?::(?:\h{1,4}:){2}\g<ls32>|(?:(?:\h{1,4}:){,3}\h{1,4})?::\h{1,4}:\g<ls32>|(?:(?:\h{1,4}:){,4}\h{1,4})?::\g<ls32>|(?:(?:\h{1,4}:){,5}\h{1,4})?::\h{1,4}|(?:(?:\h{1,4}:){,6}\h{1,4})?::)|(?<IPvFuture>v\h+\.[!$&-.0-;=A-Z_a-z~]+)\])|\g<IPv4address>|(?<reg-name>(?:%\h\h|[!$&-.0-9;=A-Z_a-z~])+))?(?::(?<port>\d*))?)(?<path-abempty>(?:\/(?<segment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])*))*)|(?<path-absolute>\/(?:(?<segment-nz>(?:%\h\h|[!$&-.0-;=@-Z_a-z~])+)(?:\/\g<segment>)*)?)|(?<path-noscheme>(?<segment-nz-nc>(?:%\h\h|[!$&-.0-9;=@-Z_a-z~])+)(?:\/\g<segment>)*)|(?<path-empty>))(?:\?(?<query>(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*))?(?:\#(?<fragment>(?:%\h\h|[!$&-.0-;=@-Z_a-z~\/?])*))?)\z/
 
     def split(uri) #:nodoc:
-      uri = uri.to_str
+      begin
+        uri = uri.to_str
+      rescue NoMethodError
+        raise InvalidURIError, "bad URI(is not URI?): #{uri}"
+      end
       unless uri.ascii_only?
         raise InvalidURIError, "URI must be ascii only #{uri.dump}"
       end
diff --git a/test/uri/test_parser.rb b/test/uri/test_parser.rb
index adf8a1292c..188b4f858c 100644
--- a/test/uri/test_parser.rb
+++ b/test/uri/test_parser.rb
@@ -38,4 +38,10 @@ class URI::TestParser < Test::Unit::TestCase
     assert_equal(['http', nil, 'a', URI::HTTP.default_port, '/%uDCBA', nil, nil],
 		 uri_to_ary(u1))
   end
+
+  def test_raise_bad_uri_for_integer
+    assert_raise(URI::InvalidURIError) do
+      URI.parse(1)
+    end
+  end
 end