github/rclone
1
Fork 0
mirror of https://github.com/rclone/rclone synced 2024-11-13 12:09:47 +01:00
Code Releases Activity

s3: fix crash if a bad listing is received - fixes #1927

Browse Source 
Caringo Swarm is returning a listing with IsTruncated set but no
NextMarker and no Keys.  Rclone doesn't know how to continue the
listing at this point, so it returns an error rather than truncating
the listing or risking a loop.
This commit is contained in:
Nick Craig-Wood 2017-12-20 16:40:41 +00:00
parent 0d4bff8239
commit 255d3e925d
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
s3/s3.go
View File

@ -554,6 +554,9 @@ func (f *Fs) list(dir string, recurse bool, fn listFn) error {
}
// Use NextMarker if set, otherwise use last Key
if resp.NextMarker == nil || *resp.NextMarker == "" {
if len(resp.Contents) == 0 {
return errors.New("s3 protocol error: received listing with IsTruncated set, no NextMarker and no Contents")
}
marker = resp.Contents[len(resp.Contents)-1].Key
} else {
marker = resp.NextMarker