Merge branch 'sh-handle-invalid-gitattributes' into 'master'

Ignore .gitattributes if they contain invalid byte sequences

Closes #216210

See merge request gitlab-org/gitlab!30922

changelogs/unreleased/sh-handle-invalid-gitattributes.yml

+---
+title: Ignore .gitattributes if they contain invalid byte sequences
+merge_request: 30922
+author:
+type: fixed

lib/gitlab/git/attributes_parser.rb

@@ -85,6 +85,8 @@ module Gitlab
 
           yield line.strip
         end
+      # Catch invalid byte sequences
+      rescue ArgumentError
       end
 
       private

spec/lib/gitlab/git/attributes_parser_spec.rb

@@ -75,6 +75,14 @@ describe Gitlab::Git::AttributesParser, :seed_helper do
         expect(subject.attributes('test.foo')).to eq({})
       end
     end
+
+    context 'when attributes data has binary data' do
+      let(:data) { "\xFF\xFE*\u0000.\u0000c\u0000s".b }
+
+      it 'returns an empty Hash' do
+        expect(subject.attributes('test.foo')).to eq({})
+      end
+    end
   end
 
   describe '#patterns' do