diff options
| author | 6543 <6543@obermui.de> | 2021-08-31 10:06:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-31 16:06:01 +0800 |
| commit | 0274933c22ac71f5289c0e227158f4a7feecc4f7 (patch) | |
| tree | 2a029bf263c9b5a18285fbc4dad9be690afef134 /modules/git/blob_nogogit.go | |
| parent | 67776372d672b3e4d0e58d05dd550c81b7bf11c4 (diff) | |
| download | gitea-0274933c22ac71f5289c0e227158f4a7feecc4f7.tar.gz gitea-0274933c22ac71f5289c0e227158f4a7feecc4f7.zip | |
Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (#16899) (#16900)
* make sure headGitRepo is closed on err too
* refactor
* Fix git.Blob.DataAsync(): exec cancel since we already read all bytes (close pipe since we return a NopCloser)
Co-authored-by: zeripath <art27@cantab.net>
Diffstat (limited to 'modules/git/blob_nogogit.go')
| -rw-r--r-- | modules/git/blob_nogogit.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/git/blob_nogogit.go b/modules/git/blob_nogogit.go index 5b42920ebe..f70ecb5333 100644 --- a/modules/git/blob_nogogit.go +++ b/modules/git/blob_nogogit.go @@ -46,8 +46,8 @@ func (b *Blob) DataAsync() (io.ReadCloser, error) { if size < 4096 { bs, err := ioutil.ReadAll(io.LimitReader(rd, size)) + defer cancel() if err != nil { - cancel() return nil, err } _, err = rd.Discard(1) @@ -105,12 +105,12 @@ func (b *blobReader) Read(p []byte) (n int, err error) { // Close implements io.Closer func (b *blobReader) Close() error { + defer b.cancel() if b.n > 0 { for b.n > math.MaxInt32 { n, err := b.rd.Discard(math.MaxInt32) b.n -= int64(n) if err != nil { - b.cancel() return err } b.n -= math.MaxInt32 @@ -118,14 +118,12 @@ func (b *blobReader) Close() error { n, err := b.rd.Discard(int(b.n)) b.n -= int64(n) if err != nil { - b.cancel() return err } } if b.n == 0 { _, err := b.rd.Discard(1) b.n-- - b.cancel() return err } return nil |