Fix: panic when childer is nil (#127)

* Fix panic when childer is nil Signed-off-by: Antonio Navarro Perez <antnavper@gmail.com> * Apply suggestions from code review Co-authored-by: Gus Eggert <gus@gus.dev> Signed-off-by: Antonio Navarro Perez <antnavper@gmail.com> Co-authored-by: Gus Eggert <gus@gus.dev>
ipfs · Oct 12, 2022 · fede2ed · fede2ed
1 parent 2c23c3e
commit fede2ed
Show file tree

Hide file tree

Showing 2 changed files with 49 additions and 5 deletions.
diff --git a/hamt/hamt.go b/hamt/hamt.go
@@ -86,7 +86,12 @@ type Shard struct {
 
 // NewShard creates a new, empty HAMT shard with the given size.
 func NewShard(dserv ipld.DAGService, size int) (*Shard, error) {
-	ds, err := makeShard(dserv, size)
+	return NewShardValue(dserv, size, "", nil)
+}
+
+// NewShardValue creates a new, empty HAMT shard with the given key, value and size.
+func NewShardValue(dserv ipld.DAGService, size int, key string, value *ipld.Link) (*Shard, error) {
+	ds, err := makeShard(dserv, size, key, value)
 	if err != nil {
 		return nil, err
 	}
@@ -96,7 +101,7 @@ func NewShard(dserv ipld.DAGService, size int) (*Shard, error) {
 	return ds, nil
 }
 
-func makeShard(ds ipld.DAGService, size int) (*Shard, error) {
+func makeShard(ds ipld.DAGService, size int, key string, val *ipld.Link) (*Shard, error) {
 	lg2s, err := Logtwo(size)
 	if err != nil {
 		return nil, err
@@ -109,6 +114,9 @@ func makeShard(ds ipld.DAGService, size int) (*Shard, error) {
 		childer:      newChilder(ds, size),
 		tableSize:    size,
 		dserv:        ds,
+
+		key: key,
+		val: val,
 	}
 
 	s.childer.sd = s
@@ -138,7 +146,7 @@ func NewHamtFromDag(dserv ipld.DAGService, nd ipld.Node) (*Shard, error) {
 
 	size := int(fsn.Fanout())
 
-	ds, err := makeShard(dserv, size)
+	ds, err := makeShard(dserv, size, "", nil)
 	if err != nil {
 		return nil, err
 	}
@@ -214,7 +222,7 @@ func (ds *Shard) Node() (ipld.Node, error) {
 
 func (ds *Shard) makeShardValue(lnk *ipld.Link) (*Shard, error) {
 	lnk2 := *lnk
-	s, err := makeShard(ds.dserv, ds.tableSize)
+	s, err := makeShard(ds.dserv, ds.tableSize, "", nil)
 	if err != nil {
 		return nil, err
 	}
@@ -795,7 +803,11 @@ func (s *childer) insert(key string, lnk *ipld.Link, idx int) error {
 
 	lnk.Name = s.sd.linkNamePrefix(idx) + key
 	i := s.sliceIndex(idx)
-	sd := &Shard{key: key, val: lnk}
+
+	sd, err := NewShardValue(s.dserv, 256, key, lnk)
+	if err != nil {
+		return err
+	}
 
 	s.children = append(s.children[:i], append([]*Shard{sd}, s.children[i:]...)...)
 	s.links = append(s.links[:i], append([]*ipld.Link{nil}, s.links[i:]...)...)

diff --git a/hamt/hamt_test.go b/hamt/hamt_test.go
@@ -435,6 +435,38 @@ func TestDuplicateAddShard(t *testing.T) {
 	}
 }
 
+// fix https://github.com/ipfs/kubo/issues/9063
+func TestSetLink(t *testing.T) {
+	ds := mdtest.Mock()
+	dir, _ := NewShard(ds, 256)
+	_, s, err := makeDir(ds, 300)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	lnk, err := s.Link()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	ctx := context.Background()
+
+	err = dir.SetLink(ctx, "test", lnk)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(dir.childer.children) != 1 {
+		t.Fatal("no child")
+	}
+
+	for _, sh := range dir.childer.children {
+		if sh.childer == nil {
+			t.Fatal("no childer on shard")
+		}
+	}
+}
+
 func TestLoadFailsFromNonShard(t *testing.T) {
 	ds := mdtest.Mock()
 	nd := ft.EmptyDirNode()