From 20ee1ae65e57ef7d60404277162c84c572c6bb10 Mon Sep 17 00:00:00 2001
From: obscuren <geffobscura@gmail.com>
Date: Mon, 21 Jul 2014 20:38:43 +0200
Subject: Refactored CALLDATALOAD to use big int

* Added BigMin
---
 ethchain/vm.go | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'ethchain/vm.go')

diff --git a/ethchain/vm.go b/ethchain/vm.go
index 34ecd95b7..a9bed1eca 100644
--- a/ethchain/vm.go
+++ b/ethchain/vm.go
@@ -503,13 +503,17 @@ func (vm *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
 			vm.Printf(" => %v", vm.vars.Value)
 		case CALLDATALOAD:
 			require(1)
-			offset := stack.Pop().Int64()
+			var (
+				offset  = stack.Pop()
+				data    = make([]byte, 32)
+				lenData = big.NewInt(int64(len(closure.Args)))
+			)
 
-			data := make([]byte, 32)
-			if big.NewInt(int64(len(closure.Args))).Cmp(big.NewInt(offset)) >= 0 {
-				l := int64(math.Min(float64(offset+32), float64(len(closure.Args))))
+			if lenData.Cmp(offset) >= 0 {
+				length := new(big.Int).Add(offset, ethutil.Big32)
+				length = ethutil.BigMin(length, lenData)
 
-				copy(data, closure.Args[offset:l])
+				copy(data, closure.Args[offset.Int64():length.Int64()])
 			}
 
 			vm.Printf(" => 0x%x", data)
-- 
cgit v1.2.3