diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2017-12-06 18:28:27 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2017-12-06 18:28:45 +0100 |
| commit | d704f0c4a0af626aac48d5a74ab6f05f7233a496 (patch) | |
| tree | e181a88285d8c99fbf10faf7a75cdf022b6090db | |
| parent | bf934a8f7c506bea0b453690c7b0e79db7004afc (diff) | |
| download | gitlab-ce-gitaly-prevent-dup.tar.gz | |
Prevent dups when using StringIO for binary readsgitaly-prevent-dup
| -rw-r--r-- | lib/gitlab/gitaly_client.rb | 6 | ||||
| -rw-r--r-- | lib/gitlab/gitaly_client/wiki_service.rb | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index f27cd800bdd..1fe938a39a8 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -336,6 +336,12 @@ module Gitlab s.dup.force_encoding(Encoding::ASCII_8BIT) end + def self.binary_stringio(s) + io = StringIO.new(s || '') + io.set_encoding(Encoding::ASCII_8BIT) + io + end + def self.encode_repeated(a) Google::Protobuf::RepeatedField.new(:bytes, a.map { |s| self.encode(s) } ) end diff --git a/lib/gitlab/gitaly_client/wiki_service.rb b/lib/gitlab/gitaly_client/wiki_service.rb index c8f065f5881..337d225d081 100644 --- a/lib/gitlab/gitaly_client/wiki_service.rb +++ b/lib/gitlab/gitaly_client/wiki_service.rb @@ -18,12 +18,11 @@ module Gitlab commit_details: gitaly_commit_details(commit_details) ) - strio = StringIO.new(content) + strio = GitalyClient.binary_stringio(content) enum = Enumerator.new do |y| until strio.eof? - chunk = strio.read(MAX_MSG_SIZE) - request.content = GitalyClient.encode(chunk) + request.content = strio.read(MAX_MSG_SIZE) y.yield request @@ -46,12 +45,11 @@ module Gitlab commit_details: gitaly_commit_details(commit_details) ) - strio = StringIO.new(content) + strio = GitalyClient.binary_stringio(content) enum = Enumerator.new do |y| until strio.eof? - chunk = strio.read(MAX_MSG_SIZE) - request.content = GitalyClient.encode(chunk) + request.content = strio.read(MAX_MSG_SIZE) y.yield request |