Merge pull request ethereum#596 from thanhnguyennguyen/snapshot-fix-b…

…ug-out-of-range tomox-snapshot: check size of priceTree
ngtuna · Jul 30, 2019 · 41d565b · 41d565b
2 parents 66c9e64 + bafbd7d
commit 41d565b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/tomox/redblacktree.go b/tomox/redblacktree.go
@@ -214,7 +214,7 @@ func (tree *Tree) Size() uint64 {
 func (tree *Tree) Keys(dryrun bool) [][]byte {
 	keys := make([][]byte, tree.size)
 	it := tree.Iterator()
-	for i := 0; it.Next(dryrun); i++ {
+	for i := 0; it.Next(dryrun) && i < len(keys); i++ {
 		keys[i] = it.Key()
 	}
 	return keys
@@ -224,7 +224,7 @@ func (tree *Tree) Keys(dryrun bool) [][]byte {
 func (tree *Tree) Values(dryrun bool) [][]byte {
 	values := make([][]byte, tree.size)
 	it := tree.Iterator()
-	for i := 0; it.Next(dryrun); i++ {
+	for i := 0; it.Next(dryrun) && i < len(values); i++ {
 		values[i] = it.Value()
 	}
 	return values

diff --git a/tomox/snapshot.go b/tomox/snapshot.go
@@ -107,6 +107,7 @@ func prepareOrderTreeData(tree *OrderTree) (*OrderTreeSnapshot, error) {
 	if !tree.NotEmpty() || tree.PriceTree.Size() == 0 {
 		return snap, nil
 	}
+
 	// foreach each price, snapshot its orderlist
 	for _, key := range tree.PriceTree.Keys(false) {
 		priceKeyHash := common.BytesToHash(key)

diff --git a/tomox/tomox.go b/tomox/tomox.go
@@ -1177,7 +1177,7 @@ func (tomox *TomoX) Snapshot(blockHash common.Hash) error {
 	}(time.Now())
 
 	if snap, err = newSnapshot(tomox, blockHash); err != nil {
-		return nil
+		return err
 	}
 	if err = snap.store(tomox.db); err != nil {
 		return err