Skip to content

Commit 1958ae2

Browse files
committed
solver: fix possible panic from error handler
If error is returned from `Save()`, `rck` is nil and causes nil dereference panic on accessing `TraceFields` when printing debug logs. Signed-off-by: Tonis Tiigi <[email protected]>
1 parent 83bc8df commit 1958ae2

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

solver/cachemanager.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,15 +298,20 @@ func (c *cacheManager) LoadWithParents(ctx context.Context, rec *CacheRecord) (r
298298
return results, nil
299299
}
300300

301-
func (c *cacheManager) Save(k *CacheKey, r Result, createdAt time.Time) (rck *ExportableCacheKey, rerr error) {
301+
func (c *cacheManager) Save(k *CacheKey, r Result, createdAt time.Time) (rck *ExportableCacheKey, err error) {
302302
lg := bklog.G(context.TODO()).WithFields(logrus.Fields{
303303
"cache_manager": c.id,
304304
"op": "save",
305305
"result": r.ID(),
306306
"stack": bklog.TraceLevelOnlyStack(),
307307
})
308308
defer func() {
309-
lg.WithError(rerr).WithField("return_cachekey", rck.TraceFields()).Trace("cache manager")
309+
if err != nil {
310+
lg = lg.WithError(err)
311+
} else {
312+
lg = lg.WithField("return_cachekey", rck.TraceFields())
313+
}
314+
lg.Trace("cache manager")
310315
}()
311316

312317
c.mu.Lock()

0 commit comments

Comments
 (0)