root
/
sftp
mirror of https://github.com/pkg/sftp.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

bugfix: int64 math overflows possible on 32-bit architectures

This commit is contained in:
Cassondra Foesch 2021-04-22 23:26:15 +00:00
parent 197384b8ce
commit 9a42bd2223
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client.go
View File

@ -1058,7 +1058,7 @@ func (f *File) ReadAt(b []byte, off int64) (int, error) {
errCh := make(chan rErr)
concurrency := len(b)/f.c.maxPacket + 1
if concurrency > f.c.maxConcurrentRequests {
if concurrency > f.c.maxConcurrentRequests || concurrency < 1 {
concurrency = f.c.maxConcurrentRequests
}
@ -1181,7 +1181,7 @@ func (f *File) WriteTo(w io.Writer) (written int64, err error) {
}
concurrency := int(fileSize/uint64(f.c.maxPacket) + 1) // a bad guess, but better than no guess
if concurrency > f.c.maxConcurrentRequests {
if concurrency > f.c.maxConcurrentRequests || concurrency < 1 {
concurrency = f.c.maxConcurrentRequests
}
@ -1410,7 +1410,7 @@ func (f *File) writeAtConcurrent(b []byte, off int64) (int, error) {
errCh := make(chan wErr)
concurrency := len(b)/f.c.maxPacket + 1
if concurrency > f.c.maxConcurrentRequests {
if concurrency > f.c.maxConcurrentRequests || concurrency < 1 {
concurrency = f.c.maxConcurrentRequests
}
@ -1520,7 +1520,7 @@ func (f *File) readFromConcurrent(r io.Reader, remain int64) (read int64, err er
errCh := make(chan rwErr)
concurrency := int(remain/int64(f.c.maxPacket) + 1) // a bad guess, but better than no guess
if concurrency > f.c.maxConcurrentRequests {
if concurrency > f.c.maxConcurrentRequests || concurrency < 1 {
concurrency = f.c.maxConcurrentRequests
}
@ -1650,6 +1650,10 @@ func (f *File) ReadFrom(r io.Reader) (int64, error) {
}
}
if remain < 0 {
remain = math.MaxInt64
}
if remain > int64(f.c.maxPacket) {
// Only use concurrency, if it would be at least two read/writes.
return f.readFromConcurrent(r, remain)