lib/grit_ext.rb in gitlab-grit-2.6.5 vs lib/grit_ext.rb in gitlab-grit-2.6.6

@@ -12,30 +12,36 @@
   def encode!(message)
     return nil unless message.respond_to? :force_encoding
 
     # if message is utf-8 encoding, just return it
     message.force_encoding("UTF-8")
-    return message if message.valid_encoding?
+    return ensure_encoding(message) if message.valid_encoding?
 
     # return message if message type is binary
     detect = CharlockHolmes::EncodingDetector.detect(message)
-    return message.force_encoding("BINARY") if detect && detect[:type] == :binary
+    return ensure_encoding(message.force_encoding("BINARY")) if detect && detect[:type] == :binary
 
     # encoding message to detect encoding
     if detect && detect[:encoding]
       message.force_encoding(detect[:encoding])
     end
 
     # encode and clean the bad chars
-    message.replace clean(message)
+    message = message.replace clean(message)
+    ensure_encoding(message)
   rescue
     encoding = detect ? detect[:encoding] : "unknown"
     "--broken encoding: #{encoding}"
   end
 
   private
+
   def clean(message)
     message.encode("UTF-16BE", :undef => :replace, :invalid => :replace, :replace => "")
            .encode("UTF-8")
            .gsub("\0".encode("UTF-8"), "")
+  end
+
+  def ensure_encoding(message)
+    message.encode('UTF-8', :invalid => :replace, :undef => :replace, :replace => "")
   end
 end