Skip to content

Commit c5960d4

Browse files
committed
Fix crash in aptly db recover
1 parent a20eb68 commit c5960d4

2 files changed

Lines changed: 5 additions & 1 deletion

File tree

deb/local.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ func (collection *LocalRepoCollection) Update(repo *LocalRepo) error {
168168

169169
// LoadComplete loads additional information for local repo
170170
func (collection *LocalRepoCollection) LoadComplete(repo *LocalRepo) error {
171+
repo.packageRefs = &PackageRefList{}
172+
171173
encoded, err := collection.db.Get(repo.RefKey())
172174
if err == database.ErrNotFound {
173175
return nil
@@ -176,7 +178,6 @@ func (collection *LocalRepoCollection) LoadComplete(repo *LocalRepo) error {
176178
return err
177179
}
178180

179-
repo.packageRefs = &PackageRefList{}
180181
return repo.packageRefs.Decode(encoded)
181182
}
182183

deb/reflist.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,9 @@ func (l *PackageRefList) Decode(input []byte) error {
7979

8080
// ForEach calls handler for each package ref in list
8181
func (l *PackageRefList) ForEach(handler func([]byte) error) error {
82+
if l == nil {
83+
return nil
84+
}
8285
var err error
8386
for _, p := range l.Refs {
8487
err = handler(p)

0 commit comments

Comments
 (0)