diff options
author | Amir Bandeali <abandeali1@gmail.com> | 2018-08-25 09:15:22 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-25 09:15:22 +0800 |
commit | f938c989e3e07161de20dd865baf59eecdde872d (patch) | |
tree | 565f92c50b1655347bac61b27a8cbe67f2c1e21f /packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol | |
parent | 74ce893f520db6ae4617432975b5c9321ff5b89b (diff) | |
parent | c8500cab10b8ffd175acd760cbd1286577a1c4b1 (diff) | |
download | dexon-sol-tools-f938c989e3e07161de20dd865baf59eecdde872d.tar dexon-sol-tools-f938c989e3e07161de20dd865baf59eecdde872d.tar.gz dexon-sol-tools-f938c989e3e07161de20dd865baf59eecdde872d.tar.bz2 dexon-sol-tools-f938c989e3e07161de20dd865baf59eecdde872d.tar.lz dexon-sol-tools-f938c989e3e07161de20dd865baf59eecdde872d.tar.xz dexon-sol-tools-f938c989e3e07161de20dd865baf59eecdde872d.tar.zst dexon-sol-tools-f938c989e3e07161de20dd865baf59eecdde872d.zip |
Merge pull request #1002 from 0xProject/feature/contracts/mutex
[contracts] Add mutexes and reentrancy guards
Diffstat (limited to 'packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol')
-rw-r--r-- | packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol b/packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol index 821d30279..4a59b6c0f 100644 --- a/packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol +++ b/packages/contracts/src/2.0.0/protocol/Exchange/MixinTransactions.sol @@ -155,7 +155,8 @@ contract MixinTransactions is view returns (address) { - address contextAddress = currentContextAddress == address(0) ? msg.sender : currentContextAddress; + address currentContextAddress_ = currentContextAddress; + address contextAddress = currentContextAddress_ == address(0) ? msg.sender : currentContextAddress_; return contextAddress; } } |