Only set the encoding before passing to Ansi2html

1 files changed, 8 insertions, 3 deletions

diff --git a/lib/gitlab/ci/trace/stream.rb b/lib/gitlab/ci/trace/stream.rb
index 8d9fb6ff0f1..757a8e2dc6a 100644
--- a/lib/gitlab/ci/trace/stream.rb
+++ b/lib/gitlab/ci/trace/stream.rb
@@ -14,9 +14,7 @@ module Gitlab
 
         def initialize
           @stream = yield
-          @stream.binmode
-          # Ci::Ansi2html::Converter would read from @stream directly
-          @stream.set_encoding(Encoding.default_external)
+          @stream.binmode if @stream
         end
 
         def valid?
@@ -58,12 +56,14 @@ module Gitlab
         end
 
         def html_with_state(state = nil)
+          set_encoding_for_ansi2html
           ::Ci::Ansi2html.convert(stream, state)
         end
 
         def html(last_lines: nil)
           text = raw(last_lines: last_lines)
           stream = StringIO.new(text)
+          set_encoding_for_ansi2html(stream)
           ::Ci::Ansi2html.convert(stream).html
         end
 
@@ -117,6 +117,11 @@ module Gitlab
 
           chunks.join.lines.last(last_lines).join
         end
+
+        def set_encoding_for_ansi2html(stream = @stream)
+          # Ci::Ansi2html::Converter would read from @stream directly
+          stream.set_encoding(Encoding.default_external)
+        end
       end
     end
   end