Merge pull request #13681 from AdamKorcz/fuzz5

server/storage/mvcc: fix oss-fuzz issue 44449
etcd-io · Feb 13, 2022 · bdb13e2 · bdb13e2
2 parents 489b308 + 029c354
commit bdb13e2
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/server/storage/mvcc/index.go b/server/storage/mvcc/index.go
@@ -257,8 +257,14 @@ func (ti *treeIndex) Equal(bi index) bool {
 	equal := true
 
 	ti.tree.Ascend(func(item btree.Item) bool {
-		aki := item.(*keyIndex)
-		bki := b.tree.Get(item).(*keyIndex)
+		var aki, bki *keyIndex
+		var ok bool
+		if aki, ok = item.(*keyIndex); !ok {
+			return false
+		}
+		if bki, ok = b.tree.Get(item).(*keyIndex); !ok {
+			return false
+		}
 		if !aki.equal(bki) {
 			equal = false
 			return false