go/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2025-01-24 12:56:36 +02:00
Code Issues Releases Activity

crypt: fix reading 0 length files

Browse Source 
In an earlier patch

d5afcf9e34044e5b crypt: try not to return "unexpected EOF" error

This introduced a bug for 0 length files which this fixes which only
manifests if the io.Reader returns data and EOF which not all readers
do.

This was failing in the integration tests.
This commit is contained in:
Nick Craig-Wood 2023-04-24 16:24:22 +01:00
parent 864eb89a67
commit bb6cfe109d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/crypt/cipher.go
View File

@ -804,7 +804,7 @@ func (c *Cipher) newDecrypter(rc io.ReadCloser) (*decrypter, error) {
if n < fileHeaderSize && err == io.EOF { if n < fileHeaderSize && err == io.EOF {
// This read from 0..fileHeaderSize-1 bytes // This read from 0..fileHeaderSize-1 bytes
return nil, fh.finishAndClose(ErrorEncryptedFileTooShort) return nil, fh.finishAndClose(ErrorEncryptedFileTooShort)
} else if err != nil { } else if err != io.EOF && err != nil {
return nil, fh.finishAndClose(err) return nil, fh.finishAndClose(err)
} }
// check the magic // check the magic