fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-05-30 14:41:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1689 from tendermint/1688-tx-search-panic

Browse Source 
validate per_page before page
This commit is contained in:
Ethan Buchman 2018-06-05 07:52:49 -07:00 committed by GitHub
commit d2259696af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpc/core/pipe.go
View File

@ -125,6 +125,10 @@ func SetEventBus(b *types.EventBus) {
} }
func validatePage(page, perPage, totalCount int) int { func validatePage(page, perPage, totalCount int) int {
if perPage < 1 {
return 1
}
pages := ((totalCount - 1) / perPage) + 1 pages := ((totalCount - 1) / perPage) + 1
if page < 1 { if page < 1 {
page = 1 page = 1

2
rpc/core/pipe_test.go
View File

@ -15,6 +15,8 @@ func TestPaginationPage(t *testing.T) {
page int page int
newPage int newPage int
}{ }{
{0, 0, 1, 1},
{0, 10, 0, 1}, {0, 10, 0, 1},
{0, 10, 1, 1}, {0, 10, 1, 1},
{0, 10, 2, 1}, {0, 10, 2, 1},

2
rpc/core/tx.go
View File

@ -189,8 +189,8 @@ func TxSearch(query string, prove bool, page, perPage int) (*ctypes.ResultTxSear
} }
totalCount := len(results) totalCount := len(results)
page = validatePage(page, perPage, totalCount)
perPage = validatePerPage(perPage) perPage = validatePerPage(perPage)
page = validatePage(page, perPage, totalCount)
skipCount := (page - 1) * perPage skipCount := (page - 1) * perPage
apiResults := make([]*ctypes.ResultTx, cmn.MinInt(perPage, totalCount-skipCount)) apiResults := make([]*ctypes.ResultTx, cmn.MinInt(perPage, totalCount-skipCount))