fix mergeIterator

Consensys · Dec 16, 2024 · db574a4 · db574a4
1 parent cd1d7a3
commit db574a4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/backend/groth16/bn254/mpcsetup/phase2.go b/backend/groth16/bn254/mpcsetup/phase2.go
diff --git a/backend/groth16/internal/utils.go b/backend/groth16/internal/utils.go
@@ -57,15 +57,18 @@ func (i *MergeIterator) findLeast() {
 // Peek returns the next smallest value and the index of the slice it came from
 // If the iterator is empty, Peek returns (math.MaxInt, -1)
 func (i *MergeIterator) Peek() (value, index int) {
+	if i.leastIndex == -1 {
+		return math.MaxInt, -1
+	}
 	return i.slices[i.leastIndex][0], i.leastIndex
 }
 
 // Next returns the next smallest value and the index of the slice it came from, and advances the iterator
 // If the iterator is empty, Next returns (math.MaxInt, -1)
 func (i *MergeIterator) Next() (value, index int) {
 	value, index = i.Peek()
-	i.findLeast()
 	i.slices[i.leastIndex] = i.slices[i.leastIndex][1:]
+	i.findLeast()
 	return
 }