From d52af7cebb8255ca78fe3e5a4bf9ef0757936c2c Mon Sep 17 00:00:00 2001 From: Jarek Kowalski Date: Thu, 24 Dec 2020 20:35:29 -0800 Subject: [PATCH] fixed cases where nil was passed to errors.Wrap() causing nil to be returned (#747) --- repo/maintenance/maintenance_schedule.go | 2 +- repo/object/object_manager.go | 2 +- repo/open.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/repo/maintenance/maintenance_schedule.go b/repo/maintenance/maintenance_schedule.go index 154810545..0a5889428 100644 --- a/repo/maintenance/maintenance_schedule.go +++ b/repo/maintenance/maintenance_schedule.go @@ -87,7 +87,7 @@ func GetSchedule(ctx context.Context, rep MaintainableRepository) (*Schedule, er } if len(v) < c.NonceSize() { - return nil, errors.Wrap(err, "invalid schedule blob") + return nil, errors.Errorf("invalid schedule blob") } j, err := c.Open(nil, v[0:c.NonceSize()], v[c.NonceSize():], maintenanceScheduleAEADExtraData) diff --git a/repo/object/object_manager.go b/repo/object/object_manager.go index ca8708418..1a4d60f08 100644 --- a/repo/object/object_manager.go +++ b/repo/object/object_manager.go @@ -354,7 +354,7 @@ func (om *Manager) newRawReader(ctx context.Context, objectID ID, assertLength i } if assertLength != -1 && int64(len(payload)) != assertLength { - return nil, errors.Wrapf(err, "unexpected chunk length %v, expected %v", len(payload), assertLength) + return nil, errors.Errorf("unexpected chunk length %v, expected %v", len(payload), assertLength) } return newObjectReaderWithData(payload), nil diff --git a/repo/open.go b/repo/open.go index b3f1c1232..42852098c 100644 --- a/repo/open.go +++ b/repo/open.go @@ -214,7 +214,7 @@ func writeCacheMarker(cacheDir string) error { return nil } - if !os.IsNotExist(err) { + if err != nil && !os.IsNotExist(err) { return errors.Wrap(err, "unexpected cache marker error") }