Merge branch 'master' into develop

92b16618 · obscuren · a3771e7d · 06ec80f3 · 92b16618
Commit 92b16618 authored Jul 23, 2014 by obscuren
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

vm.go ethchain/vm.go +3 -1

No files found.
--- 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