Skip to content

Commit fc9e25b

Browse files
authored
fix the nil reference issue, just add the error handle logic (#194)
1 parent 555f765 commit fc9e25b

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

pkg/convert/parser.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ import (
1313

1414
// format is a Serialized trie (see transporttrie.Serialize implementation)
1515
func ParseTrie(r io.Reader, cb func(name []byte, val int)) error {
16-
t, _ := transporttrie.Deserialize(r)
16+
t, err := transporttrie.Deserialize(r)
17+
if err != nil {
18+
return err
19+
}
1720
t.Iterate(func(name []byte, val uint64) {
1821
cb(name, int(val))
1922
})

pkg/server/ingest.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ type ingestParams struct {
2828
func wrapConvertFunction(convertFunc func(r io.Reader, cb func(name []byte, val int)) error) func(io.Reader) (*tree.Tree, error) {
2929
return func(r io.Reader) (*tree.Tree, error) {
3030
t := tree.New()
31-
convertFunc(r, func(k []byte, v int) {
31+
if err := convertFunc(r, func(k []byte, v int) {
3232
t.Insert(k, uint64(v))
33-
})
33+
}); err != nil {
34+
return nil, err
35+
}
3436

3537
return t, nil
3638
}

0 commit comments

Comments
 (0)