Skip to content

Decode on a binary copy in the pure-Ruby unescape #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
youdie006 wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −2
Open

Decode on a binary copy in the pure-Ruby unescape #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/cgi/escape.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ def escape(string)
# # => "'Stop!' said Fred"
def unescape(string, encoding = @@accept_charset)
string = string_value(string)
str = string.tr('+', ' ')
str = str.b
str = string.b
str.tr!('+', ' ')
str.gsub!(/((?:%[0-9a-fA-F]{2})+)/) do |m|
[m.delete('%')].pack('H*')
end
Expand Down
12 changes: 12 additions & 0 deletions test/cgi/test_cgi_escape.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,18 @@ def test_cgi_unescape_nil
assert_raise(TypeError) { CGI.unescape(nil) }
end

def test_cgi_unescape_invalid_byte_sequence
# unescape must not raise on bytes that are invalid in the string's own
# encoding; escape and unescapeURIComponent already decode on a binary copy.
s = "\x80&".dup.force_encoding("UTF-8")
assert_equal(s.b, CGI.unescape(s.dup).b)
assert_equal(s.b, CGI.unescapeURIComponent(s.dup).b)
# ordinary decoding is unchanged
assert_equal("a b", CGI.unescape("a+b"))
assert_equal("+", CGI.unescape("%2B"))
assert_equal("'Stop!' said Fred", CGI.unescape("%27Stop%21%27+said+Fred"))
end

def test_cgi_escapeURIComponent
assert_equal('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93', CGI.escapeURIComponent(@str1))
assert_equal('%26%3C%3E%22%20%E3%82%86%E3%82%93%E3%82%86%E3%82%93'.ascii_only?, CGI.escapeURIComponent(@str1).ascii_only?) if defined?(::Encoding)
Expand Down