octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-05 21:07:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/scanner: When scanning a file, stick to the size given by Lstat (fixes #3440)

Browse Source 
Otherwise if the file grows during scanning the block list will be out
of sync with the stated size and things get confused. We could fixup the
size afterwards based on the block list, but then we might see other
inconsistencies as the mtime should have changed to reflect the new size
etc. Better stick to the original state and let the next scan pick up
the change.

GitHub-Pull-Request: https://github.com/syncthing/syncthing/pull/3442
This commit is contained in:
Jakob Borg 2016-07-25 19:16:49 +00:00 committed by Audrius Butkevicius
parent 0f28626bb4
commit 2a6f164923
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/scanner/blocks.go
View File

@ -31,7 +31,8 @@ func Blocks(r io.Reader, blocksize int, sizehint int64, counter Counter) ([]prot
if sizehint > 0 { if sizehint > 0 {
// Allocate contiguous blocks for the BlockInfo structures and their // Allocate contiguous blocks for the BlockInfo structures and their
// hashes once and for all. // hashes once and for all, and stick to the specified size.
r = io.LimitReader(r, sizehint)
numBlocks := int(sizehint / int64(blocksize)) numBlocks := int(sizehint / int64(blocksize))
blocks = make([]protocol.BlockInfo, 0, numBlocks) blocks = make([]protocol.BlockInfo, 0, numBlocks)
hashes = make([]byte, 0, hashLength*numBlocks) hashes = make([]byte, 0, hashLength*numBlocks)