handle invalid encoding

Author: ahorek

lib/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
@@ -90,7 +93,8 @@ def unescapeHTML(string)
  when Encoding::ISO_8859_1; 256
  else 128
  end
- string.gsub(/&(apos|amp|quot|gt|lt|\#[0-9]+|\#[xX][0-9A-Fa-f]+);/) do
+ string = string.b
+ string.gsub!(/&(apos|amp|quot|gt|lt|\#[0-9]+|\#[xX][0-9A-Fa-f]+);/) do
  match = $1.dup
  case match
  when 'apos' then "'"
@@ -116,6 +120,7 @@ def unescapeHTML(string)
  "&#{match};"
  end
  end
+ string.force_encoding enc
  end
 
  # Synonym for CGI.escapeHTML(str)