Merge branch 'master' into develop

2014-07-23 12:04:45 +02:00 · 2014-07-23 12:04:45 +02:00 · 92b16618ed
commit 92b16618ed
parent a3771e7d7b 06ec80f394
1 changed files with 3 additions and 1 deletions
--- a/ethchain/vm.go
+++ b/ethchain/vm.go
@ -306,7 +306,9 @@ func (vm *Vm) RunClosure(closure *Closure) (ret []byte, err error) {
 			x, y := stack.Popn()
 			vm.Printf(" %v / %v", y, x)

-			base.Div(y, x)
+			if x.Cmp(ethutil.Big0) != 0 {
+				base.Div(y, x)
+			}

 			vm.Printf(" = %v", base)
 			// Pop result back on the stack