diff options
| author | Grey Baker <greysteil@gmail.com> | 2015-05-03 15:04:07 +0100 |
|---|---|---|
| committer | Grey Baker <greysteil@gmail.com> | 2015-06-08 18:50:38 +0100 |
| commit | 05a2a6a0c5ac2384e52df9b8c2aa81352a51d7c7 (patch) | |
| tree | 1e90feb55b9c8a49ddf3ca737185354a22d444bb /activesupport/lib | |
| parent | a69e0a5fcfbcd76f259ab1ed290fafa8726b44ba (diff) | |
| download | rails-05a2a6a0c5ac2384e52df9b8c2aa81352a51d7c7.tar.gz rails-05a2a6a0c5ac2384e52df9b8c2aa81352a51d7c7.tar.bz2 rails-05a2a6a0c5ac2384e52df9b8c2aa81352a51d7c7.zip | |
Handle invalid UTF-8 strings when HTML escaping
Use `ActiveSupport::Multibyte::Unicode.tidy_bytes` to handle invalid UTF-8
strings in `ERB::Util.unwrapped_html_escape` and `ERB::Util.html_escape_once`.
Prevents user-entered input passed from a querystring into a form field from
causing invalid byte sequence errors.
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string/output_safety.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb index c676b26b06..084f6fecda 100644 --- a/activesupport/lib/active_support/core_ext/string/output_safety.rb +++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb @@ -37,7 +37,7 @@ class ERB if s.html_safe? s else - s.gsub(HTML_ESCAPE_REGEXP, HTML_ESCAPE) + ActiveSupport::Multibyte::Unicode.tidy_bytes(s).gsub(HTML_ESCAPE_REGEXP, HTML_ESCAPE) end end module_function :unwrapped_html_escape @@ -50,7 +50,7 @@ class ERB # html_escape_once('<< Accept & Checkout') # # => "<< Accept & Checkout" def html_escape_once(s) - result = s.to_s.gsub(HTML_ESCAPE_ONCE_REGEXP, HTML_ESCAPE) + result = ActiveSupport::Multibyte::Unicode.tidy_bytes(s.to_s).gsub(HTML_ESCAPE_ONCE_REGEXP, HTML_ESCAPE) s.html_safe? ? result.html_safe : result end |