Merge pull request #188 from ethereumjs/double-callback

Avoid double-callbacks in CALL
ethereumjs · Sep 13, 2017 · c85ab76 · c85ab76
2 parents bb507be + a17c5d8
commit c85ab76
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/lib/opFns.js b/lib/opFns.js
@@ -561,22 +561,22 @@ module.exports = {
             }
           }
         }
-      })
 
-      try {
-        checkCallMemCost(runState, options, localOpts)
-        checkOutOfGas(runState, options)
-      } catch (e) {
-        done(e.error)
-        return
-      }
+        try {
+          checkCallMemCost(runState, options, localOpts)
+          checkOutOfGas(runState, options)
+        } catch (e) {
+          done(e.error)
+          return
+        }
 
-      if (!value.isZero()) {
-        runState.gasLeft.iadd(new BN(fees.callStipend.v))
-        options.gasLimit.iadd(new BN(fees.callStipend.v))
-      }
+        if (!value.isZero()) {
+          runState.gasLeft.iadd(new BN(fees.callStipend.v))
+          options.gasLimit.iadd(new BN(fees.callStipend.v))
+        }
 
-      makeCall(runState, options, localOpts, done)
+        makeCall(runState, options, localOpts, done)
+      })
     })
   },
   CALLCODE: function (gas, toAddress, value, inOffset, inLength, outOffset, outLength, runState, done) {