ruby-changes:42267
From: nagachika <ko1@a...>
Date: Tue, 29 Mar 2016 02:23:38 +0900 (JST)
Subject: [ruby-changes:42267] nagachika:r54341 (ruby_2_2): merge revision(s) 49254: [Backport #10738]
nagachika 2016-03-29 02:23:34 +0900 (Tue, 29 Mar 2016) New Revision: 54341 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54341 Log: merge revision(s) 49254: [Backport #10738] * 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 Modified directories: branches/ruby_2_2/ Modified files: branches/ruby_2_2/ChangeLog branches/ruby_2_2/lib/uri/mailto.rb branches/ruby_2_2/test/uri/test_mailto.rb branches/ruby_2_2/version.h Index: ruby_2_2/lib/uri/mailto.rb =================================================================== --- ruby_2_2/lib/uri/mailto.rb (revision 54340) +++ ruby_2_2/lib/uri/mailto.rb (revision 54341) @@ -135,6 +135,10 @@ module URI https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/uri/mailto.rb#L135 @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 Index: ruby_2_2/version.h =================================================================== --- ruby_2_2/version.h (revision 54340) +++ ruby_2_2/version.h (revision 54341) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1 #define RUBY_VERSION "2.2.5" #define RUBY_RELEASE_DATE "2016-03-29" -#define RUBY_PATCHLEVEL 283 +#define RUBY_PATCHLEVEL 284 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 Index: ruby_2_2/ChangeLog =================================================================== --- ruby_2_2/ChangeLog (revision 54340) +++ ruby_2_2/ChangeLog (revision 54341) @@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1 +Tue Mar 29 02:22:35 2016 Martin Duerst <duerst@i...> + + * 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 + Tue Mar 29 02:08:40 2016 Koichi Sasada <ko1@a...> * signal.c: should also clear ruby_disable_gc. Index: ruby_2_2/test/uri/test_mailto.rb =================================================================== --- ruby_2_2/test/uri/test_mailto.rb (revision 54340) +++ ruby_2_2/test/uri/test_mailto.rb (revision 54341) @@ -104,6 +104,9 @@ class TestMailTo < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/uri/test_mailto.rb#L104 # 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@e...?subject=1+1=2", []] Property changes on: ruby_2_2 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r49254 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/