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

fix error if the input is mixed Unicode and percent-escapes

Browse source 
Reported by kivikakk (Ashe Connor) with tests and doc fix
Patch based on mame and fix by naruse
[Bug #14586]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2018-03-08 09:38:01 +00:00
parent 0a2fb188e3
commit 6db869c101
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/uri/rfc2396_parser.rb
View file

@ -315,13 +315,13 @@ module URI
#
# :call-seq:
# unescape( str )
# unescape( str, unsafe )
# unescape( str, escaped )
#
# == Args
#
# +str+::
# String to remove escapes from
# +unsafe+::
# +escaped+::
# Regexp to apply. Defaults to self.regexp[:ESCAPED]
#
# == Description
@ -329,7 +329,7 @@ module URI
# Removes escapes from +str+
#
def unescape(str, escaped = @regexp[:ESCAPED])
str.gsub(escaped) { [$&[1, 2].hex].pack('C') }.force_encoding(str.encoding)
str.gsub(escaped) { [$&[1, 2]].pack('H2').force_encoding(str.encoding) }
end
@@to_s = Kernel.instance_method(:to_s)

7
test/uri/test_parser.rb
View file

@ -45,4 +45,11 @@ class URI::TestParser < Test::Unit::TestCase
URI.parse(1)
end
end
def test_unescape
p1 = URI::Parser.new
assert_equal("\xe3\x83\x90", p1.unescape("\xe3\x83\x90"))
assert_equal("\xe3\x83\x90", p1.unescape('%e3%83%90'))
assert_equal("\xe3\x83\x90\xe3\x83\x90", p1.unescape("\xe3\x83\x90%e3%83%90"))
end
end