mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-09-08 17:03:44 +00:00
Prevent NPE on invalid diff (#17197)
* 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:
parent
3bbdce2601
commit
206ea10b45
3 changed files with 7 additions and 2 deletions
|
@ -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")
|
||||||
}
|
}
|
||||||
|
|
|
@ -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()
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
|
@ -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()
|
||||||
}
|
}
|
||||||
}()
|
}()
|
||||||
|
|
Loading…
Reference in a new issue