cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5876 from ethereum/addPaddingToCode

Browse Source 
Pad code to multiple of 32 bytes.
This commit is contained in:
chriseth 2019-01-30 14:49:55 +01:00 committed by GitHub
commit 7768ce2172
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -1,6 +1,7 @@
### 0.5.4 (unreleased)
Bugfixes:
* Code generator: Defensively pad allocation of creationCode and runtimeCode to multiples of 32 bytes.
* Parser: Disallow empty import statements.
* Type system: Properly report packed encoded size for arrays and structs (mostly unused until now).

2
libsolidity/codegen/ExpressionCompiler.cpp
View File

@ -1348,7 +1348,7 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
m_context.appendInlineAssembly(
Whiskers(R"({
mstore(start, sub(end, add(start, 0x20)))
mstore(<free>, end)
mstore(<free>, and(add(end, 31), not(31)))
})")("free", to_string(CompilerUtils::freeMemoryPointer)).render(),
{"start", "end"}
);

19
test/libsolidity/SolidityEndToEndTest.cpp
View File

@ -14275,6 +14275,25 @@ BOOST_AUTO_TEST_CASE(code_access)
ABI_CHECK(codeRuntime1, codeRuntime2);
}
BOOST_AUTO_TEST_CASE(code_access_padding)
{
char const* sourceCode = R"(
contract C {
function diff() public pure returns (uint remainder) {
bytes memory a = type(D).creationCode;
bytes memory b = type(D).runtimeCode;
assembly { remainder := mod(sub(b, a), 0x20) }
}
}
contract D {
function f() public pure returns (uint) { return 7; }
}
)";
compileAndRun(sourceCode, 0, "C");
// This checks that the allocation function pads to multiples of 32 bytes
ABI_CHECK(callContractFunction("diff()"), encodeArgs(0));
}
BOOST_AUTO_TEST_CASE(code_access_create)
{
char const* sourceCode = R"(