Merge branch 'master' into develop

2014-07-22 12:16:09 +02:00 · 2014-07-22 12:16:09 +02:00 · 9c86e99968
commit 9c86e99968
parent 8f91d47bf3 6774ddaba2
1 changed files with 1 additions and 1 deletions
--- a/ethchain/vm.go
+++ b/ethchain/vm.go
@ -506,7 +506,7 @@ func (vm *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
 			offset := stack.Pop().Int64()

 			data := make([]byte, 32)
-			if len(closure.Args) >= int(offset) {
+			if big.NewInt(int64(len(closure.Args))).Cmp(big.NewInt(offset)) >= 0 {
 				l := int64(math.Min(float64(offset+32), float64(len(closure.Args))))

 				copy(data, closure.Args[offset:l])