CGI.escapeHTML restore the original encoding

jruby · Mar 2, 2020 · 6ba4e4a · 6ba4e4a
1 parent 06bcc6e
commit 6ba4e4a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/ruby/stdlib/cgi/util.rb b/lib/ruby/stdlib/cgi/util.rb
@@ -49,9 +49,12 @@ def escapeHTML(string)
       table = Hash[TABLE_FOR_ESCAPE_HTML__.map {|pair|pair.map {|s|s.encode(enc)}}]
       string = string.gsub(/#{"['&\"<>]".encode(enc)}/, table)
       string.encode!(origenc) if origenc
-      return string
+      string
+    else
+      string = string.b
+      string.gsub!(/['&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
+      string.force_encoding(enc)
     end
-    string.gsub(/['&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
   end
 
   begin

diff --git a/spec/tags/ruby/library/cgi/escapeHTML_tags.txt b/spec/tags/ruby/library/cgi/escapeHTML_tags.txt