Skip to content

Add check for invalid target. Closes #24 #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gbalabasquer wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add check for invalid target. Closes #24 #25

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26ef0d5
Add check for invalid target. Closes #24
gbalabasquer Jan 21, 2019
5c91a66
Use different vairables for sizes
gbalabasquer Jan 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/proxy.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,16 @@ contract DSProxy is DSAuth, DSNote {
returns (bytes memory response)
{
require(_target != address(0), "ds-proxy-target-address-required");
uint size;
assembly {
size := extcodesize(_target)
}
require(size > 0, "ds-proxy-target-invalid-address");

// call contract in current context
assembly {
let succeeded := delegatecall(sub(gas, 5000), _target, add(_data, 0x20), mload(_data), 0, 0)
let size := returndatasize
size := returndatasize

response := mload(0x40)
mstore(0x40, add(response, and(add(add(size, 0x20), 0x1f), not(0x1f))))
Expand Down
13 changes: 13 additions & 0 deletions src/proxy.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,19 @@ contract DSProxyTest is DSTest {
assertEq(address(this).balance, myBalance + 5);
}

///test 14 - check failure when an address without code is used as target
function testFail_executeNonContract() public {
bytes memory data = abi.encodeWithSignature("test()");
proxy.execute(address(0x1), data);
}

///test 15 - check failure when a non existing function is called
function testFail_executeNonFunction() public {
address testContract = address(new TestContract());
bytes memory data = abi.encodeWithSignature("nonExistingFunction()");
proxy.execute(testContract, data);
}

function() external payable {
}
}