lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-12-21 11:00:08 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

fix possible out of range bytes

Browse Source 
avoid buff out of range resp.Data = buff[:totalRead]
This commit is contained in:
Chris Lu
2020-08-16 23:47:34 -07:00
parent 48ed7f8a32
commit 2ac27616bc
3 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
weed/filesys/dirty_page_interval.go
View File

@@ -3,7 +3,6 @@ package filesys
import (
"bytes"
"io"
"math"
)
type IntervalNode struct {
@@ -186,25 +185,15 @@ func (c *ContinuousIntervals) removeList(target *IntervalLinkedList) {
}
func (c *ContinuousIntervals) ReadData(data []byte, startOffset int64) (offset int64, size int) {
var minOffset int64 = math.MaxInt64
var maxStop int64
func (c *ContinuousIntervals) ReadData(data []byte, startOffset int64) (maxStop int64) {
for _, list := range c.lists {
start := max(startOffset, list.Offset())
stop := min(startOffset+int64(len(data)), list.Offset()+list.Size())
if start <= stop {
if start < stop {
list.ReadData(data[start-startOffset:], start, stop)
minOffset = min(minOffset, start)
maxStop = max(maxStop, stop)
}
}
if minOffset == math.MaxInt64 {
return 0, 0
}
offset = minOffset
size = int(maxStop - offset)
return
}