Browse Source

avoid overflow

pull/1255/head
Chris Lu 5 years ago
parent
commit
f06ca04451
  1. 7
      weed/filer2/filechunks.go
  2. 2
      weed/filer2/stream.go

7
weed/filer2/filechunks.go

@ -3,6 +3,7 @@ package filer2
import (
"fmt"
"hash/fnv"
"math"
"sort"
"sync"
@ -86,6 +87,12 @@ func ViewFromChunks(chunks []*filer_pb.FileChunk, offset int64, size int64) (vie
func ViewFromVisibleIntervals(visibles []VisibleInterval, offset int64, size int64) (views []*ChunkView) {
stop := offset + size
if size == math.MaxInt64 {
stop = math.MaxInt64
}
if stop < offset {
stop = math.MaxInt64
}
for _, chunk := range visibles {

2
weed/filer2/stream.go

@ -61,7 +61,7 @@ var _ = io.ReadSeeker(&ChunkStreamReader{})
func NewChunkStreamReaderFromFiler(masterClient *wdclient.MasterClient, chunks []*filer_pb.FileChunk) *ChunkStreamReader {
chunkViews := ViewFromChunks(chunks, 0, math.MaxInt64)
chunkViews := ViewFromChunks(chunks, 0, math.MaxInt32)
return &ChunkStreamReader{
chunkViews: chunkViews,

Loading…
Cancel
Save