Commit 631c8d8a authored by acud's avatar acud Committed by GitHub

intervalstore: fix uint64 overflow bug (#1609)

parent 8020b87d
...@@ -24,6 +24,7 @@ package intervalstore ...@@ -24,6 +24,7 @@ package intervalstore
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"math"
"strconv" "strconv"
"sync" "sync"
) )
...@@ -68,19 +69,23 @@ func (i *Intervals) add(start, end uint64) { ...@@ -68,19 +69,23 @@ func (i *Intervals) add(start, end uint64) {
if end < i.start { if end < i.start {
return return
} }
endCheck := end + 1
if end == math.MaxUint64 {
endCheck = end
}
minStartJ := -1 minStartJ := -1
maxEndJ := -1 maxEndJ := -1
j := 0 j := 0
for ; j < len(i.ranges); j++ { for ; j < len(i.ranges); j++ {
if minStartJ < 0 { if minStartJ < 0 {
if (start <= i.ranges[j][0] && end+1 >= i.ranges[j][0]) || (start <= i.ranges[j][1]+1 && end+1 >= i.ranges[j][1]) { if (start <= i.ranges[j][0] && endCheck >= i.ranges[j][0]) || (start <= i.ranges[j][1]+1 && endCheck >= i.ranges[j][1]) {
if i.ranges[j][0] < start { if i.ranges[j][0] < start {
start = i.ranges[j][0] start = i.ranges[j][0]
} }
minStartJ = j minStartJ = j
} }
} }
if (start <= i.ranges[j][1] && end+1 >= i.ranges[j][1]) || (start <= i.ranges[j][0] && end+1 >= i.ranges[j][0]) { if (start <= i.ranges[j][1] && endCheck >= i.ranges[j][1]) || (start <= i.ranges[j][0] && endCheck >= i.ranges[j][0]) {
if i.ranges[j][1] > end { if i.ranges[j][1] > end {
end = i.ranges[j][1] end = i.ranges[j][1]
} }
...@@ -222,7 +227,7 @@ func (i *Intervals) UnmarshalBinary(data []byte) (err error) { ...@@ -222,7 +227,7 @@ func (i *Intervals) UnmarshalBinary(data []byte) (err error) {
if err != nil { if err != nil {
return fmt.Errorf("parsing the second element in range %d: %v", j, err) return fmt.Errorf("parsing the second element in range %d: %v", j, err)
} }
i.ranges = append(i.ranges, [2]uint64{start, end}) i.add(start, end)
} }
return nil return nil
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment