r00t2/gosecret
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

fix - suppress nil/empty items from being added to slices

Browse Source
This commit is contained in:
brent s.
2021-12-18 00:57:41 -05:00
parent fa3061ee7a
commit 3f4db5e82c
3 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
collection_funcs.go
View File

@@ -146,15 +146,16 @@ func (c *Collection) Items() (items []*Item, err error) {
paths = variant.Value().([]dbus.ObjectPath)
items = make([]*Item, len(paths))
items = make([]*Item, 0)
for idx, path := range paths {
for _, path := range paths {
item = nil
if item, err = NewItem(c, path); err != nil {
errs = append(errs, err)
err = nil
continue
}
items[idx] = item
items = append(items, item)
}
err = NewErrors(err)
@@ -245,6 +246,7 @@ func (c *Collection) SearchItems(profile string) (items []*Item, err error) {
var paths []dbus.ObjectPath
var errs []error = make([]error, 0)
var attrs map[string]string = make(map[string]string, 0)
var item *Item
attrs["profile"] = profile
@@ -254,14 +256,16 @@ func (c *Collection) SearchItems(profile string) (items []*Item, err error) {
return
}
items = make([]*Item, len(paths))
items = make([]*Item, 0)
for idx, path := range paths {
if items[idx], err = NewItem(c, path); err != nil {
for _, path := range paths {
item = nil
if item, err = NewItem(c, path); err != nil {
errs = append(errs, err)
err = nil
continue
}
items = append(items, item)
}
err = NewErrors(err)