gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues 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
Show stats 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 {

11
weed/filer2/reader_at_test.go
View file

@ -77,6 +77,11 @@ func testReadAt(t *testing.T, readerAt *ChunkReadAt, offset int64, size int, exp
data := make([]byte, size)
n, err := readerAt.ReadAt(data, offset)
for _, d := range data {
fmt.Printf("%x", d)
}
fmt.Println()
if expected != n {
t.Errorf("unexpected read size: %d, expect: %d", n, expected)
}
@ -84,10 +89,6 @@ func testReadAt(t *testing.T, readerAt *ChunkReadAt, offset int64, size int, exp
t.Errorf("unexpected read error: %v, expect: %v", err, expectedErr)
}
for _, d := range data {
fmt.Printf("%x", d)
}
fmt.Println()
}
func TestReaderAt0(t *testing.T) {
@ -119,4 +120,6 @@ func TestReaderAt0(t *testing.T) {
testReadAt(t, readerAt, 3, 16, 7, io.EOF)
testReadAt(t, readerAt, 3, 5, 5, nil)
testReadAt(t, readerAt, 11, 5, 0, io.EOF)
}