Merge branch '1474-search-files-bytes' into 'master'

Make clear there is no []byte reuse bug in SearchFilesByContent

Closes #1474

See merge request gitlab-org/gitaly!1055

2 files changed, 12 insertions, 2 deletions

diff --git a/changelogs/unreleased/1474-search-files-bytes.yml b/changelogs/unreleased/1474-search-files-bytes.yml
new file mode 100644
index 000000000..9e25f8613
--- /dev/null
+++ b/changelogs/unreleased/1474-search-files-bytes.yml
@@ -0,0 +1,5 @@
+---
+title: Make clear there is no []byte reuse bug in SearchFilesByContent
+merge_request: 1055
+author:
+type: other
diff --git a/internal/service/repository/search_files.go b/internal/service/repository/search_files.go
index 936a97798..a69ce913b 100644
--- a/internal/service/repository/search_files.go
+++ b/internal/service/repository/search_files.go
@@ -122,8 +122,13 @@ func sendSearchFilesResultChunked(cmd *command.Command, stream gitalypb.Reposito
 	scanner := bufio.NewScanner(cmd)
 
 	for scanner.Scan() {
-		line := append(scanner.Bytes(), '\n')
-		if bytes.Equal(line, contentDelimiter) {
+		// Intentionally avoid scanner.Bytes() because that returns a []byte that
+		// becomes invalid on the next loop iteration, and we want to hold on to
+		// the contents of the current line for a while. Scanner.Text() is a
+		// string and hence immutable.
+		line := scanner.Text() + "\n"
+
+		if line == string(contentDelimiter) {
 			if err := sendMatchInChunks(buf, stream); err != nil {
 				return err
 			}