gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix for out of range reads

Browse Source
This commit is contained in:
Chris Lu
2020-08-17 22:46:32 -07:00
parent 56fbd2c211
commit 1b68ba953b
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
weed/filer2/reader_at.go
View File

@@ -108,12 +108,10 @@ func (c *ChunkReadAt) doReadAt(p []byte, offset int64) (n int, err error) {
glog.V(4).Infof("doReadAt [%d,%d), n:%v, err:%v", offset, offset+int64(len(p)), n, err)
if remaining > 0 {
glog.V(4).Infof("zero2 [%d,%d)", n, n+int(remaining))
n += int(remaining)
if n > int(c.fileSize - offset){
n = int(c.fileSize - offset)
}
if remaining > 0 && c.fileSize > startOffset {
delta := int(min(remaining, c.fileSize - startOffset))
glog.V(4).Infof("zero2 [%d,%d)", n, n+delta)
n += delta
}
if offset+int64(n) >= c.fileSize {