1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

escape.c: check argument

Browse Source 
* ext/cgi/escape/escape.c (optimized_unescape): check
  accept_charset encoding argument.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-02-02 08:02:36 +00:00
parent ffcb389d68
commit c373866444
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ext/cgi/escape/escape.c
View File

@ -252,7 +252,8 @@ optimized_unescape(VALUE str, VALUE encoding)
long i, len, beg = 0; long i, len, beg = 0;
VALUE dest = 0; VALUE dest = 0;
const char *cstr; const char *cstr;
int cr, origenc, encidx = rb_to_encoding_index(encoding); rb_encoding *enc = rb_to_encoding(encoding);
int cr, origenc, encidx = rb_enc_to_index(enc);
len = RSTRING_LEN(str); len = RSTRING_LEN(str);
cstr = RSTRING_PTR(str); cstr = RSTRING_PTR(str);

6
test/cgi/test_cgi_util.rb
View File

@ -56,6 +56,12 @@ class CGIUtilTest < Test::Unit::TestCase
assert_equal(Encoding::UTF_8, CGI::unescape("%C0%3C%3C".force_encoding("UTF-8")).encoding) assert_equal(Encoding::UTF_8, CGI::unescape("%C0%3C%3C".force_encoding("UTF-8")).encoding)
end end
def test_cgi_unescape_accept_charset
return unless defined?(::Encoding)
assert_raise(TypeError) {CGI.unescape('', nil)}
end
def test_cgi_pretty def test_cgi_pretty
assert_equal("<HTML>\n <BODY>\n </BODY>\n</HTML>\n",CGI::pretty("<HTML><BODY></BODY></HTML>")) assert_equal("<HTML>\n <BODY>\n </BODY>\n</HTML>\n",CGI::pretty("<HTML><BODY></BODY></HTML>"))
assert_equal("<HTML>\n\t<BODY>\n\t</BODY>\n</HTML>\n",CGI::pretty("<HTML><BODY></BODY></HTML>","\t")) assert_equal("<HTML>\n\t<BODY>\n\t</BODY>\n</HTML>\n",CGI::pretty("<HTML><BODY></BODY></HTML>","\t"))