finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix git.Blob.DataAsync(): close pipe since we return a NopCloser (#16899)

Browse source 
* 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)
This commit is contained in:
6543 2021-08-31 09:43:31 +02:00 • committed by GitHub
parent bb4cc876b1
commit d21702475b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
routers/web/repo/compare.go
View file

@ -621,7 +621,6 @@ func CompareDiff(ctx *context.Context) {
headGitRepo.Close()
}
}()
if ctx.Written() {
return
}

3
routers/web/repo/issue.go
View file

@ -419,9 +419,6 @@ func RetrieveRepoMilestonesAndAssignees(ctx *context.Context, repo *models.Repos
}
handleTeamMentions(ctx)
if ctx.Written() {
return
}
}
func retrieveProjects(ctx *context.Context, repo *models.Repository) {

6
routers/web/repo/pull.go
View file

@ -1024,10 +1024,14 @@ func CompareAndPullRequestPost(ctx *context.Context) {
)
headUser, headRepo, headGitRepo, prInfo, baseBranch, headBranch := ParseCompareInfo(ctx)
defer func() {
if headGitRepo != nil {
headGitRepo.Close()
}
}()
if ctx.Written() {
return
}
defer headGitRepo.Close()
labelIDs, assigneeIDs, milestoneID, _ := ValidateRepoMetas(ctx, *form, true)
if ctx.Written() {