Do not double close reader (#29354) (#29370)

Backport #29354 by @KN4CK3R Fixes #29346 Co-authored-by: KN4CK3R <[email protected]> Co-authored-by: wxiaoguang <[email protected]>
go-gitea · Feb 24, 2024 · e75594f · e75594f
1 parent a1c0b3a
commit e75594f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git 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
@@ -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 {