fedi/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-29 20:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent NPE on invalid diff (#17197)

Browse source 
* Prevent NPE on invalid diff

If ParseCompareInfo returns a nil compare info the defer function needs to ensure
that it does not attempt to close the HeadGitRepo.

Fix #17193

Signed-off-by: Andrew Thornton <art27@cantab.net>

* add TEST

Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
zeripath 2021-09-30 20:31:02 +01:00 committed by GitHub
parent 3bbdce2601
commit 206ea10b45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
integrations/compare_test.go
View file

@ -6,6 +6,7 @@ package integrations
import ( import (
"net/http" "net/http"
"strings"
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@ -21,4 +22,8 @@ func TestCompareTag(t *testing.T) {
selection := htmlDoc.doc.Find(".choose.branch .filter.dropdown") selection := htmlDoc.doc.Find(".choose.branch .filter.dropdown")
// A dropdown for both base and head. // A dropdown for both base and head.
assert.Lenf(t, selection.Nodes, 2, "The template has changed") assert.Lenf(t, selection.Nodes, 2, "The template has changed")
req = NewRequest(t, "GET", "/user2/repo1/compare/invalid")
resp = session.MakeRequest(t, req, http.StatusNotFound)
assert.False(t, strings.Contains(resp.Body.String(), "/assets/img/500.png"), "expect 404 page not 500")
} }

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

@ -635,7 +635,7 @@ func getBranchesAndTagsForRepo(user *models.User, repo *models.Repository) (bool
func CompareDiff(ctx *context.Context) { func CompareDiff(ctx *context.Context) {
ci := ParseCompareInfo(ctx) ci := ParseCompareInfo(ctx)
defer func() { defer func() {
if ci.HeadGitRepo != nil { if ci != nil && ci.HeadGitRepo != nil {
ci.HeadGitRepo.Close() ci.HeadGitRepo.Close()
} }
}() }()

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

@ -1043,7 +1043,7 @@ func CompareAndPullRequestPost(ctx *context.Context) {
ci := ParseCompareInfo(ctx) ci := ParseCompareInfo(ctx)
defer func() { defer func() {
if ci.HeadGitRepo != nil { if ci != nil && ci.HeadGitRepo != nil {
ci.HeadGitRepo.Close() ci.HeadGitRepo.Close()
} }
}() }()