Do not double close reader (#29354)

Fixes #29346

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

diff --git a/modules/git/blob_nogogit.go b/modules/git/blob_nogogit.go
index 9e1c2a0376d40aaee4e931cdbcc8e81bd10cd2c1..945a6bc432c29bd0b586cc2c755d587da49513db 100644 (file)
--- a/modules/git/blob_nogogit.go
+++ b/modules/git/blob_nogogit.go
@@ -102,7 +102,17 @@ func (b *blobReader) Read(p []byte) (n int, err error) {
 
 // Close implements io.Closer
 func (b *blobReader) Close() error {
+       if b.rd == nil {
+               return nil
+       }
+
        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
 }

diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go
index bc3cb8801d02313ad880f2f13ded84ddd808b54f..28644fbe3d57e4ad208cb55203be0051f64adcd2 100644 (file)
--- a/routers/web/repo/editor.go
+++ b/routers/web/repo/editor.go
@@ -161,9 +161,6 @@ func editFile(ctx *context.Context, isNewFile bool) {
                }
 
                d, _ := io.ReadAll(dataRc)
-               if err := dataRc.Close(); err != nil {
-                       log.Error("Error whilst closing blob data: %v", err)
-               }
 
                buf = append(buf, d...)
                if content, err := charset.ToUTF8(buf, charset.ConvertOpts{KeepBOM: true}); err != nil {