summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-14 09:06:13 +0000
committerduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-14 09:06:13 +0000
commite3c4c7e13bcf5b202701ef5acc86b06187b5fdb7 (patch)
treea2ec29d0bfd115050b5c26dac014f6802e6aab9a
parenta9e033b104921bfa0dc4e3d99df1acc9f1258db4 (diff)
* lib/uri/mailto.rb: raising URI::InvalidComponentError instead
of failing with undefined method `split' for nil:NilClass for mailto: URIs without opaque part. [Bug #10738] * test/uri/testuri.rb: Test for above git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49254 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--lib/uri/mailto.rb4
-rw-r--r--test/uri/test_mailto.rb3
3 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f591f2c..b13a8c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 14 18:06:06 2015 Martin Duerst <duerst@it.aoyama.ac.jp>
+
+ * lib/uri/mailto.rb: raising URI::InvalidComponentError instead
+ of failing with undefined method `split' for nil:NilClass for
+ mailto: URIs without opaque part. [Bug #10738]
+ * test/uri/testuri.rb: Test for above
+
Wed Jan 14 16:45:24 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* tool/downloader.rb (RubyGems.download): verify downloaded gem
diff --git a/lib/uri/mailto.rb b/lib/uri/mailto.rb
index 497d963..b440563 100644
--- a/lib/uri/mailto.rb
+++ b/lib/uri/mailto.rb
@@ -135,6 +135,10 @@ module URI
@to = nil
@headers = []
+ unless @opaque
+ raise InvalidComponentError,
+ "missing opaque part for mailto URL"
+ end
to, header = @opaque.split('?', 2)
# allow semicolon as a addr-spec separator
# http://support.microsoft.com/kb/820868
diff --git a/test/uri/test_mailto.rb b/test/uri/test_mailto.rb
index 661f7f7..9001835 100644
--- a/test/uri/test_mailto.rb
+++ b/test/uri/test_mailto.rb
@@ -104,6 +104,9 @@ class TestMailTo < Test::Unit::TestCase
# mailto:javascript:alert()
bad << ["javascript:alert()", []]
+ # mailto:/example.com/ ; WRONG, not a mail address
+ bad << ["/example.com/", []]
+
# '=' which is in hname or hvalue is wrong.
bad << ["foo@example.jp?subject=1+1=2", []]