From f6f696c6c51d0a5d27e548b814f6efb6e5af5e8d Mon Sep 17 00:00:00 2001 From: Simon Frei Date: Thu, 15 Aug 2019 15:51:09 +0200 Subject: [PATCH] lib/config: Prevent nil deref in debug logging (fixes #5955) (#5956) --- lib/config/folderconfiguration.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/config/folderconfiguration.go b/lib/config/folderconfiguration.go index c7c8aab5f..1b8e7f6b5 100644 --- a/lib/config/folderconfiguration.go +++ b/lib/config/folderconfiguration.go @@ -248,9 +248,12 @@ func (f *FolderConfiguration) prepare() { case f.RawModTimeWindowS > 0: f.cachedModTimeWindow = time.Duration(f.RawModTimeWindowS) * time.Second case runtime.GOOS == "android": - if usage, err := disk.Usage(f.Filesystem().URI()); err != nil || usage.Fstype == "" || strings.Contains(strings.ToLower(usage.Fstype), "fat") { + if usage, err := disk.Usage(f.Filesystem().URI()); err != nil { f.cachedModTimeWindow = 2 * time.Second - l.Debugf(`Detecting FS at %v on android: Setting mtime window to 2s: err == %v, usage.Fstype == "%v"`, f.Path, err, usage.Fstype) + l.Debugf(`Detecting FS at "%v" on android: Setting mtime window to 2s: err == "%v"`, f.Path, err) + } else if usage.Fstype == "" || strings.Contains(strings.ToLower(usage.Fstype), "fat") { + f.cachedModTimeWindow = 2 * time.Second + l.Debugf(`Detecting FS at "%v" on android: Setting mtime window to 2s: usage.Fstype == "%v"`, f.Path, usage.Fstype) } else { l.Debugf(`Detecting FS at %v on android: Leaving mtime window at 0: usage.Fstype == "%v"`, f.Path, usage.Fstype) }