From 78d976e3879d4727b447f222f1ad172b1d662d63 Mon Sep 17 00:00:00 2001
From: grandizzy <grandizzy.the.egg@gmail.com>
Date: Tue, 19 Mar 2024 17:42:05 +0200
Subject: [PATCH] fix(fuzz): prevent int strategy to overflow when complicate

---
 crates/evm/fuzz/src/strategies/int.rs  | 28 +++++++++++++++++++++++++-
 crates/evm/fuzz/src/strategies/uint.rs | 16 +++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/crates/evm/fuzz/src/strategies/int.rs b/crates/evm/fuzz/src/strategies/int.rs
index e92c2d4642ca..f772d97c0c1e 100644
--- a/crates/evm/fuzz/src/strategies/int.rs
+++ b/crates/evm/fuzz/src/strategies/int.rs
@@ -67,7 +67,11 @@ impl ValueTree for IntValueTree {
             return false
         }
 
-        self.lo = self.curr + if self.hi.is_negative() { I256::MINUS_ONE } else { I256::ONE };
+        self.lo = if self.curr != I256::MIN && self.curr != I256::MAX {
+            self.curr + if self.hi.is_negative() { I256::MINUS_ONE } else { I256::ONE }
+        } else {
+            self.curr
+        };
 
         self.reposition()
     }
@@ -192,3 +196,25 @@ impl Strategy for IntStrategy {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::strategies::int::IntValueTree;
+    use alloy_primitives::I256;
+    use proptest::strategy::ValueTree;
+
+    #[test]
+    fn test_int_tree_complicate_should_not_overflow() {
+        let mut int_tree = IntValueTree::new(I256::MAX, false);
+        assert_eq!(int_tree.hi, I256::MAX);
+        assert_eq!(int_tree.curr, I256::MAX);
+        int_tree.complicate();
+        assert_eq!(int_tree.lo, I256::MAX);
+
+        let mut int_tree = IntValueTree::new(I256::MIN, false);
+        assert_eq!(int_tree.hi, I256::MIN);
+        assert_eq!(int_tree.curr, I256::MIN);
+        int_tree.complicate();
+        assert_eq!(int_tree.lo, I256::MIN);
+    }
+}
diff --git a/crates/evm/fuzz/src/strategies/uint.rs b/crates/evm/fuzz/src/strategies/uint.rs
index e1d74552612e..7b9aac1d49ed 100644
--- a/crates/evm/fuzz/src/strategies/uint.rs
+++ b/crates/evm/fuzz/src/strategies/uint.rs
@@ -167,3 +167,19 @@ impl Strategy for UintStrategy {
         }
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::strategies::uint::UintValueTree;
+    use alloy_primitives::U256;
+    use proptest::strategy::ValueTree;
+
+    #[test]
+    fn test_uint_tree_complicate_max() {
+        let mut uint_tree = UintValueTree::new(U256::MAX, false);
+        assert_eq!(uint_tree.hi, U256::MAX);
+        assert_eq!(uint_tree.curr, U256::MAX);
+        uint_tree.complicate();
+        assert_eq!(uint_tree.lo, U256::MIN);
+    }
+}