mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-26 00:03:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

More robust token checking

Browse source
This commit is contained in:
Neil Alexander 2020-12-10 17:19:53 +00:00
parent 05e956f9dd
commit ef5b4000dd
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
syncapi/types/types.go
View file

@ -261,13 +261,12 @@ func NewTopologyTokenFromString(tok string) (token TopologyToken, err error) {
if i > len(positions) {
break
}
if len(p) == 0 {
err = fmt.Errorf("empty position %d not allowed", i)
var pos int
pos, err = strconv.Atoi(p)
if err != nil {
return
}
if pos, perr := strconv.Atoi(p); perr == nil {
positions[i] = StreamPosition(pos)
}
positions[i] = StreamPosition(pos)
}
token = TopologyToken{
Depth: positions[0],
@ -309,13 +308,12 @@ func NewStreamTokenFromString(tok string) (token StreamingToken, err error) {
if i > len(positions) {
break
}
if len(p) == 0 {
err = fmt.Errorf("empty position %d not allowed", i)
var pos int
pos, err = strconv.Atoi(p)
if err != nil {
return
}
if pos, perr := strconv.Atoi(p); perr == nil {
positions[i] = StreamPosition(pos)
}
positions[i] = StreamPosition(pos)
}
token = StreamingToken{
PDUPosition: positions[0],