diff options
author | obscuren <geffobscura@gmail.com> | 2014-07-25 16:43:35 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2014-07-25 16:43:35 +0800 |
commit | d761af84c83ae8d9d723e6766abb7950ff59cdf3 (patch) | |
tree | 6fe0805649ddf38b2b90e77c5fb2000a4bdab536 /ethchain/asm.go | |
parent | 06ec80f39495bdd92878468cf862f52e9748f1ca (diff) | |
parent | 54f9ea14e197ad805f24592153f1b9e69f3bc5c3 (diff) | |
download | dexon-d761af84c83ae8d9d723e6766abb7950ff59cdf3.tar dexon-d761af84c83ae8d9d723e6766abb7950ff59cdf3.tar.gz dexon-d761af84c83ae8d9d723e6766abb7950ff59cdf3.tar.bz2 dexon-d761af84c83ae8d9d723e6766abb7950ff59cdf3.tar.lz dexon-d761af84c83ae8d9d723e6766abb7950ff59cdf3.tar.xz dexon-d761af84c83ae8d9d723e6766abb7950ff59cdf3.tar.zst dexon-d761af84c83ae8d9d723e6766abb7950ff59cdf3.zip |
Merge branch 'release/0.6.0'
Diffstat (limited to 'ethchain/asm.go')
-rw-r--r-- | ethchain/asm.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ethchain/asm.go b/ethchain/asm.go index 2697953fd..9f99b0c48 100644 --- a/ethchain/asm.go +++ b/ethchain/asm.go @@ -25,7 +25,7 @@ func Disassemble(script []byte) (asm []string) { pc.Add(pc, ethutil.Big1) a := int64(op) - int64(PUSH1) + 1 if int(pc.Int64()+a) > len(script) { - return nil + return } data := script[pc.Int64() : pc.Int64()+a] @@ -40,5 +40,5 @@ func Disassemble(script []byte) (asm []string) { pc.Add(pc, ethutil.Big1) } - return + return asm } |