diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-10-08 08:41:11 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-10-08 08:41:11 +0300 |
| commit | 982f7e5cbc4449e19d6fce3cdf8d47715548e470 (patch) | |
| tree | 0d863f228fb2a17ba787aa12861a35dc265e89f8 | |
| parent | 4f0a07ba39f14adacf7d482128a5de2bb84f0eac (diff) | |
| parent | f4da9ee67dd9d613d5974c41ab8c44aa244347dd (diff) | |
Merge branch 'jc-fix-cache-test' into 'master'
Fail Read if objectReader is closed
Closes #3823
See merge request gitlab-org/gitaly!3944
| -rw-r--r-- | internal/git/catfile/object_reader.go | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/internal/git/catfile/object_reader.go b/internal/git/catfile/object_reader.go index a87a118b1..841010758 100644 --- a/internal/git/catfile/object_reader.go +++ b/internal/git/catfile/object_reader.go @@ -5,6 +5,7 @@ import ( "context" "fmt" "io" + "os" "sync" "github.com/opentracing/opentracing-go" @@ -178,6 +179,10 @@ func (o *objectDataReader) Read(p []byte) (int, error) { o.objectReader.Lock() defer o.objectReader.Unlock() + if o.closed { + return 0, os.ErrClosed + } + n, err := o.r.Read(p) o.objectReader.consume(n) return n, err |