Bugfix: Flatten would remove the null disk addresses

Dump was failing because it was attempting to read a zero address
ava-labs · Nov 3, 2023 · c433572 · c433572
1 parent 4df2859
commit c433572
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/firewood/src/merkle.rs b/firewood/src/merkle.rs
@@ -144,7 +144,9 @@ impl<S: ShaleStore<Node> + Send + Sync> Merkle<S> {
             NodeType::Branch(n) => {
                 writeln!(w, "{n:?}")?;
                 for c in n.children {
-                    self.dump_(c, w)?
+                    if !c.is_null() {
+                        self.dump_(c, w)?
+                    }
                 }
             }
             NodeType::Leaf(n) => writeln!(w, "{n:?}").unwrap(),
@@ -929,7 +931,9 @@ impl<S: ShaleStore<Node> + Send + Sync> Merkle<S> {
         match &u_ref.inner {
             NodeType::Branch(n) => {
                 for c in n.children {
-                    self.remove_tree_(c, deleted)?
+                    if !c.is_none() {
+                        self.remove_tree_(c, deleted)?
+                    }
                 }
             }
             NodeType::Leaf(_) => (),