octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-12-22 19:08:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib/ur: Prevent panic when blocksResult is nil (ref #7495) (#7515)

Browse Source
This commit is contained in:
Simon Frei 2021-03-22 15:07:41 +01:00 committed by GitHub
parent bc08a951f1
commit 6b25eb2e79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ur/usage_report.go
View File

@ -426,12 +426,12 @@ func CpuBench(ctx context.Context, iterations int, duration time.Duration, useWe
perf = v
}
}
if blocksResult == nil {
// not looking at the blocksResult makes it unused from a static
// analysis / compiler standpoint...
panic("blocksResult should have been set by benchmark loop")
// not looking at the blocksResult makes it unused from a static
// analysis / compiler standpoint...
// blocksResult may be nil at this point if the context is cancelled
if blocksResult != nil {
blocksResult = nil
}
blocksResult = nil
return perf
}