Merge branch 'develop' into rpcfrontier

1 files changed, 19 insertions, 20 deletions

diff --git a/vm/vm.go b/vm/vm.go
index 4d9e88e1a..089047a95 100644
--- a/vm/vm.go
+++ b/vm/vm.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"math/big"
 
-	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/state"
 )
 
@@ -443,24 +443,18 @@ func (self *Vm) Run(context *Context, callData []byte) (ret []byte, err error) {
 			self.Printf(" => %d", l)
 		case CALLDATACOPY:
 			var (
-				size = uint64(len(callData))
-				mOff = stack.pop().Uint64()
-				cOff = stack.pop().Uint64()
-				l    = stack.pop().Uint64()
+				mOff = stack.pop()
+				cOff = stack.pop()
+				l    = stack.pop()
 			)
-
-			if cOff > size {
-				cOff = 0
-				l = 0
-			} else if cOff+l > size {
-				l = 0
+			var data []byte
+			if cOff.Cmp(big.NewInt(int64(len(callData)))) <= 0 {
+				data = getData(callData, cOff.Uint64(), l.Uint64())
 			}
 
-			code := callData[cOff : cOff+l]
-
-			mem.Set(mOff, l, code)
+			mem.Set(mOff.Uint64(), l.Uint64(), data)
 
-			self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, callData[cOff:cOff+l])
+			self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, data)
 		case CODESIZE, EXTCODESIZE:
 			var code []byte
 			if op == EXTCODESIZE {
@@ -482,14 +476,19 @@ func (self *Vm) Run(context *Context, callData []byte) (ret []byte, err error) {
 			} else {
 				code = context.Code
 			}
+
 			var (
-				mOff = stack.pop().Uint64()
-				cOff = stack.pop().Uint64()
-				l    = stack.pop().Uint64()
+				mOff = stack.pop()
+				cOff = stack.pop()
+				l    = stack.pop()
 			)
-			codeCopy := getCode(code, cOff, l)
 
-			mem.Set(mOff, l, codeCopy)
+			var codeCopy []byte
+			if cOff.Cmp(big.NewInt(int64(len(code)))) <= 0 {
+				codeCopy = getData(code, cOff.Uint64(), l.Uint64())
+			}
+
+			mem.Set(mOff.Uint64(), l.Uint64(), codeCopy)
 
 			self.Printf(" => [%v, %v, %v] %x", mOff, cOff, l, codeCopy)
 		case GASPRICE: