From 8ff0032860cc4053e6f129e10da09535c27b55e8 Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Wed, 16 Oct 2024 16:03:21 +0300 Subject: fix: channel reader incorrectly reading anything more than bufferSize --- pkg/util/io.go | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) (limited to 'pkg/util/io.go') diff --git a/pkg/util/io.go b/pkg/util/io.go index 8c8725b..5c489ed 100644 --- a/pkg/util/io.go +++ b/pkg/util/io.go @@ -19,7 +19,10 @@ func NewChannelReader(ctx context.Context, reader io.Reader) ChannelReader { go func(in chan<- []byte, inErr chan<- error) { defer close(in) defer close(inErr) - data := make([]byte, bufferSize) + buffer := make([]byte, 2 * bufferSize) + isD1 := true + d1 := buffer[:bufferSize] + d2 := buffer[bufferSize:] outer: for { select { @@ -27,9 +30,19 @@ func NewChannelReader(ctx context.Context, reader io.Reader) ChannelReader { inErr <- ctx.Err() break outer default: + var data []byte + if isD1 { + data = d1 + } else { + data = d2 + } + isD1 = !isD1 + n, err := reader.Read(data) - if err != nil && err != io.EOF { - inErr <- err + if err != nil { + if err != io.EOF { + inErr <- err + } break outer } in <- data[:n] -- cgit v1.3.1