diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-03-23 16:52:32 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-03-23 13:55:20 -0600 |
| commit | cc10d60643f61a26dc30b2d0e663c24ab2ade3ad (patch) | |
| tree | 5e44f4903640975e443f536831d35ae260412d14 | |
| parent | 6f9b7bbfab8dd84b31247c928d2effd3fc00495b (diff) | |
| download | gitlab-ce-cc10d60643f61a26dc30b2d0e663c24ab2ade3ad.tar.gz | |
Merge branch 'fix/encoding-helper-clean-blowing-up-on-utf-16be' into 'master'
Fix EncodingHelper#clean blowing up on UTF-16BE strings
Closes gitaly#1101
See merge request gitlab-org/gitlab-ce!17943
| -rw-r--r-- | lib/gitlab/encoding_helper.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/encoding_helper_spec.rb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/encoding_helper.rb b/lib/gitlab/encoding_helper.rb index 6659efa0961..0b8f6cfe3cb 100644 --- a/lib/gitlab/encoding_helper.rb +++ b/lib/gitlab/encoding_helper.rb @@ -90,7 +90,7 @@ module Gitlab end def clean(message) - message.encode("UTF-16BE", undef: :replace, invalid: :replace, replace: "") + message.encode("UTF-16BE", undef: :replace, invalid: :replace, replace: "".encode("UTF-16BE")) .encode("UTF-8") .gsub("\0".encode("UTF-8"), "") end diff --git a/spec/lib/gitlab/encoding_helper_spec.rb b/spec/lib/gitlab/encoding_helper_spec.rb index 83d431a7458..e68c9850f6b 100644 --- a/spec/lib/gitlab/encoding_helper_spec.rb +++ b/spec/lib/gitlab/encoding_helper_spec.rb @@ -161,6 +161,11 @@ describe Gitlab::EncodingHelper do 'removes invalid bytes from ASCII-8bit encoded multibyte string.', "Lorem ipsum\xC3\n dolor sit amet, xy\xC3\xA0y\xC3\xB9abcd\xC3\xB9efg".force_encoding('ASCII-8BIT'), "Lorem ipsum\n dolor sit amet, xyàyùabcdùefg" + ], + [ + 'handles UTF-16BE encoded strings', + "\xFE\xFF\x00\x41".force_encoding('ASCII-8BIT'), # An "A" prepended with UTF-16 BOM + "\xEF\xBB\xBFA" # An "A" prepended with UTF-8 BOM ] ].each do |description, test_string, xpect| it description do |