diff options
| author | Gusted <williamzijl7@hotmail.com> | 2021-11-08 16:45:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-08 23:45:37 +0800 |
| commit | 640f0e1ddf7a5cae8a778e989046e7438067a56c (patch) | |
| tree | 8d7dd0f745455a9aab4328224f3e5d5755dea8f9 /models/branches.go | |
| parent | ebaf4c48ea278955c5d79c5f37a2039ccb3cf775 (diff) | |
| download | gitea-640f0e1ddf7a5cae8a778e989046e7438067a56c.tar.gz gitea-640f0e1ddf7a5cae8a778e989046e7438067a56c.zip | |
Only allow returned deleted branche to be on repo (#17570)
- This will only allow `GetDeletedBranchByID` to return deletedBranch
which are on the repo, and thus don't return a deletedBranch from
another repo.
- This just should prevent possible bugs in the futher when a code is
passing the wrong ID into this function.
Diffstat (limited to 'models/branches.go')
| -rw-r--r-- | models/branches.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/models/branches.go b/models/branches.go index 3c62c7a87b..caca9e23fe 100644 --- a/models/branches.go +++ b/models/branches.go @@ -536,7 +536,7 @@ func (repo *Repository) GetDeletedBranches() ([]*DeletedBranch, error) { // GetDeletedBranchByID get a deleted branch by its ID func (repo *Repository) GetDeletedBranchByID(id int64) (*DeletedBranch, error) { deletedBranch := &DeletedBranch{} - has, err := db.GetEngine(db.DefaultContext).ID(id).Get(deletedBranch) + has, err := db.GetEngine(db.DefaultContext).Where("repo_id = ?", repo.ID).And("id = ?", id).Get(deletedBranch) if err != nil { return nil, err } |