Fix multiplication overflow throw because of non-existing short-circu…

…it boolean expressions evaluation in Solidity Assembly
makerdao · Oct 19, 2019 · 8724783 · 8724783
1 parent 7061ea9
commit 8724783
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/jug.sol b/src/jug.sol
@@ -53,7 +53,9 @@ contract Jug is DSNote {
                         x := div(xxRound, b)
                         if mod(n,2) {
                             let zx := mul(z, x)
-                            if and(iszero(iszero(x)), iszero(eq(div(zx, x), z))) { revert(0,0) }
+                            if iszero(iszero(x)) {
+                                if iszero(eq(div(zx, x), z)) { revert(0,0) }
+                            }
                             let zxRound := add(zx, half)
                             if lt(zxRound, zx) { revert(0,0) }
                             z := div(zxRound, b)

diff --git a/src/pot.sol b/src/pot.sol
@@ -91,7 +91,9 @@ contract Pot is DSNote {
                         x := div(xxRound, base)
                         if mod(n,2) {
                             let zx := mul(z, x)
-                            if and(iszero(iszero(x)), iszero(eq(div(zx, x), z))) { revert(0,0) }
+                            if iszero(iszero(x)) {
+                                if iszero(eq(div(zx, x), z)) { revert(0,0) }
+                            }
                             let zxRound := add(zx, half)
                             if lt(zxRound, zx) { revert(0,0) }
                             z := div(zxRound, base)