mirror/syncthing
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing.git synced 2025-12-23 22:18:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(model): correctly handle block-aligned empty sparse files (fixes #10331) (#10332)

Browse Source 
When handling files that consist only of power-of-two-sized blocks of
zero we'd know we have nothing to write, and when using sparse files
we'd never even create the temp file. Hence the sync would fail.

Signed-off-by: Jakob Borg <jakob@kastelo.net>
This commit is contained in:
Jakob Borg
2025-09-01 22:01:29 +02:00
committed by GitHub
parent da7a75a823
commit fafc3ba45e
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/model/sharedpullerstate.go
View File

@@ -324,6 +324,15 @@ func (s *sharedPullerState) finalClose() (bool, error) {
return false, nil
}
if s.writer == nil {
// If we didn't even create a temp file up to this point, now is the
// time to do so. This also truncates the file to the correct size
// if we're using sparse file.
if err := s.addWriterLocked(); err != nil {
return false, err
}
}
if len(s.file.Encrypted) > 0 {
if err := s.finalizeEncrypted(); err != nil && s.err == nil {
// This is our error as we weren't errored before.
@@ -355,11 +364,6 @@ func (s *sharedPullerState) finalClose() (bool, error) {
// folder from encrypted data we can extract this FileInfo from the end of
// the file and regain the original metadata.
func (s *sharedPullerState) finalizeEncrypted() error {
if s.writer == nil {
if err := s.addWriterLocked(); err != nil {
return err
}
}
trailerSize, err := writeEncryptionTrailer(s.file, s.writer)
if err != nil {
return err