From 71b6a4ba85150c88414f50ac4965cab71021202d Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 20 Apr 2017 16:10:33 +0200
Subject: Return empty string on UTF8 conversion with
 U_STRING_NOT_TERMINATED_WARNING error

---
 lib/gitlab/git/encoding_helper.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib/gitlab/git')

diff --git a/lib/gitlab/git/encoding_helper.rb b/lib/gitlab/git/encoding_helper.rb
index e57d228e688..f918074cb14 100644
--- a/lib/gitlab/git/encoding_helper.rb
+++ b/lib/gitlab/git/encoding_helper.rb
@@ -40,7 +40,13 @@ module Gitlab
       def encode_utf8(message)
         detect = CharlockHolmes::EncodingDetector.detect(message)
         if detect
-          CharlockHolmes::Converter.convert(message, detect[:encoding], 'UTF-8')
+          begin
+            CharlockHolmes::Converter.convert(message, detect[:encoding], 'UTF-8')
+          rescue ArgumentError => e
+            Rails.logger.warn("Ignoring error converting #{detect[:encoding]} into UTF8: #{e.message}")
+
+            ''
+          end
         else
           clean(message)
         end
-- 
cgit v1.2.3