From fd3e8bcd4c7253928158fc457143d201bbd30898 Mon Sep 17 00:00:00 2001
From: wborgeaud <williamborgeaud@gmail.com>
Date: Thu, 29 Apr 2021 08:18:31 +0200
Subject: [PATCH] Minor fixes

---
 src/fri.rs           | 2 +-
 src/merkle_proofs.rs | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/fri.rs b/src/fri.rs
index b363f0b1..9376f449 100644
--- a/src/fri.rs
+++ b/src/fri.rs
@@ -246,7 +246,7 @@ fn compute_evaluation<F: Field>(
     // The answer is gotten by interpolating {(x*g^i, P(x*g^i))} and evaluating at beta.
     let points = g
         .powers()
-        .zip(evals.into_iter())
+        .zip(evals)
         .map(|(y, e)| (x * y, e))
         .collect::<Vec<_>>();
     let barycentric_weights = barycentric_weights(&points);
diff --git a/src/merkle_proofs.rs b/src/merkle_proofs.rs
index 8434ae49..6a4cd033 100644
--- a/src/merkle_proofs.rs
+++ b/src/merkle_proofs.rs
@@ -29,6 +29,11 @@ pub(crate) fn verify_merkle_proof<F: Field>(
     proof: &MerkleProof<F>,
     reverse_bits: bool,
 ) -> Result<()> {
+    ensure!(
+        leaf_index >> proof.siblings.len() == 0,
+        "Merkle leaf index is too large."
+    );
+
     let index = if reverse_bits {
         crate::util::reverse_bits(leaf_index, proof.siblings.len())
     } else {