mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

Do not double close reader (#29354) 

Fixes #29346

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
(cherry picked from commit 553d46e6f6a144905266d58315a2b0ff2e976380)
This commit is contained in:
KN4CK3R 2024-02-24 12:45:59 +01:00 committed by Earl Warren
parent 428008ac19
commit 64ef7d3658
No known key found for this signature in database
GPG Key ID: 0579CB2928A78A00
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/git/blob_nogogit.go
View File

@ -102,7 +102,17 @@ func (b *blobReader) Read(p []byte) (n int, err error) {
// Close implements io.Closer // Close implements io.Closer
func (b *blobReader) Close() error { func (b *blobReader) Close() error {
if b.rd == nil {
return nil
}
defer b.cancel() defer b.cancel()
return DiscardFull(b.rd, b.n+1) if err := DiscardFull(b.rd, b.n+1); err != nil {
return err
}
b.rd = nil
return nil
} }

3
routers/web/repo/editor.go
View File

@ -183,9 +183,6 @@ func editFile(ctx *context.Context, isNewFile bool) {
} }
d, _ := io.ReadAll(dataRc) d, _ := io.ReadAll(dataRc)
if err := dataRc.Close(); err != nil {
log.Error("Error whilst closing blob data: %v", err)
}
buf = append(buf, d...) buf = append(buf, d...)
if content, err := charset.ToUTF8(buf, charset.ConvertOpts{KeepBOM: true}); err != nil { if content, err := charset.ToUTF8(buf, charset.ConvertOpts{KeepBOM: true}); err != nil {