diff options
| author | pricly-yellow <79628427+pricly-yellow@users.noreply.github.com> | 2021-10-05 21:41:48 +0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-05 16:41:48 +0200 |
| commit | 20eaca6d05ddeb56f5a76638e84211117c3f0131 (patch) | |
| tree | e9ff51b835b58bcab4efd9cffd20cd720170b0cd /models | |
| parent | f4ea6cc4b479de70ac2e82330f1a0d515f7fd50f (diff) | |
| download | gitea-20eaca6d05ddeb56f5a76638e84211117c3f0131.tar.gz gitea-20eaca6d05ddeb56f5a76638e84211117c3f0131.zip | |
Fix stange behavior of DownloadPullDiffOrPatch in incorect index (#17223)
Fix GetPullRequestByIndex by validate index > 1
Signed-off-by: Danila Kryukov <pricly_yellow@dismail.de>
Co-authored-by: a1012112796 <1012112796@qq.com>
Diffstat (limited to 'models')
| -rw-r--r-- | models/pull.go | 3 | ||||
| -rw-r--r-- | models/pull_test.go | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/models/pull.go b/models/pull.go index 004af62f03..38f2c1b8ce 100644 --- a/models/pull.go +++ b/models/pull.go @@ -522,6 +522,9 @@ func GetLatestPullRequestByHeadInfo(repoID int64, branch string) (*PullRequest, // GetPullRequestByIndex returns a pull request by the given index func GetPullRequestByIndex(repoID, index int64) (*PullRequest, error) { + if index < 1 { + return nil, ErrPullRequestNotExist{} + } pr := &PullRequest{ BaseRepoID: repoID, Index: index, diff --git a/models/pull_test.go b/models/pull_test.go index 2b7ef2f664..173977aafe 100644 --- a/models/pull_test.go +++ b/models/pull_test.go @@ -134,6 +134,10 @@ func TestGetPullRequestByIndex(t *testing.T) { _, err = GetPullRequestByIndex(9223372036854775807, 9223372036854775807) assert.Error(t, err) assert.True(t, IsErrPullRequestNotExist(err)) + + _, err = GetPullRequestByIndex(1, 0) + assert.Error(t, err) + assert.True(t, IsErrPullRequestNotExist(err)) } func TestGetPullRequestByID(t *testing.T) { |