kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/uri/common.rb (URI.decode_www_form): scrub string if decoded

Browse source 
bytes are invalid for the encoding.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2013-05-18 18:58:13 +00:00
parent 2849ee5d18
commit 53fdb30e7f
3 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun May 19 03:48:26 2013 NARUSE, Yui <naruse@ruby-lang.org>
* lib/uri/common.rb (URI.decode_www_form): scrub string if decoded
bytes are invalid for the encoding.
Sun May 19 02:46:32 2013 Akinori MUSHA <knu@iDaemons.org>
* lib/set.rb (Set#delete_if, Set#keep_if): Make Set#delete_if and

22
lib/uri/common.rb
View file

@ -981,17 +981,9 @@ module URI
isindex = false
end
if use__charset_
if key == '_charset_'
if e = get_encoding(val)
enc = e
use__charset_ = false
ary.each do |k, v|
v.force_encoding(enc)
k.force_encoding(enc)
end
end
end
if use__charset_ and key == '_charset_' and e = get_encoding(val)
enc = e
use__charset_ = false
end
key.gsub!(/\+|%\h\h/, TBLDECWWWCOMP_)
@ -1001,10 +993,14 @@ module URI
val = ''
end
val.force_encoding(enc)
key.force_encoding(enc)
ary << [key, val]
end
ary.each do |k, v|
k.force_encoding(enc)
k.scrub!
v.force_encoding(enc)
v.scrub!
end
ary
end

2
test/uri/test_common.rb
View file

@ -135,6 +135,8 @@ class TestCommon < Test::Unit::TestCase
assert_raise(ArgumentError){URI.decode_www_form("\u3042")}
assert_equal([%w[a 1], ["\u3042", "\u6F22"]],
URI.decode_www_form("a=1&%E3%81%82=%E6%BC%A2"))
assert_equal([%w[a 1], ["\uFFFD%8", "\uFFFD"]],
URI.decode_www_form("a=1&%E3%81%8=%E6%BC"))
assert_equal([%w[?a 1], %w[a 2]], URI.decode_www_form("?a=1&a=2"))
assert_equal([], URI.decode_www_form(""))
assert_equal([%w[% 1]], URI.decode_www_form("%=1"))