lavender-legacy/gitea
7
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Close the dataRC reader sooner (#16023)

Browse source 
Fix #15932

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2021-05-30 17:38:44 +01:00 committed by GitHub
parent effad26c0e
commit 36dce0e457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
routers/repo/editor.go
View file

@ -106,6 +106,7 @@ func editFile(ctx *context.Context, isNewFile bool) {
ctx.NotFound("blob.Data", err) ctx.NotFound("blob.Data", err)
return return
} }
defer dataRc.Close() defer dataRc.Close()
ctx.Data["FileSize"] = blob.Size() ctx.Data["FileSize"] = blob.Size()
@ -122,6 +123,10 @@ func editFile(ctx *context.Context, isNewFile bool) {
} }
d, _ := ioutil.ReadAll(dataRc) d, _ := ioutil.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.ToUTF8WithErr(buf); err != nil { if content, err := charset.ToUTF8WithErr(buf); err != nil {
log.Error("ToUTF8WithErr: %v", err) log.Error("ToUTF8WithErr: %v", err)