From 6161ec96ff4a449d6fffa3d1e54c3fa38911c2bb Mon Sep 17 00:00:00 2001 From: chriseth Date: Thu, 1 Oct 2015 14:53:45 +0200 Subject: Bugfix in calldata unpacker. The offset was not specified correctly if memory activity preceded the unpacker. --- test/libsolidity/Assembly.cpp | 2 +- test/libsolidity/SolidityEndToEndTest.cpp | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp index b4678611..ca1e8980 100644 --- a/test/libsolidity/Assembly.cpp +++ b/test/libsolidity/Assembly.cpp @@ -108,7 +108,7 @@ BOOST_AUTO_TEST_CASE(location_test) AssemblyItems items = compileContract(sourceCode); vector locations = vector(17, SourceLocation(2, 75, n)) + - vector(26, SourceLocation(20, 72, n)) + + vector(28, SourceLocation(20, 72, n)) + vector{SourceLocation(42, 51, n), SourceLocation(65, 67, n)} + vector(4, SourceLocation(58, 67, n)) + vector(3, SourceLocation(20, 72, n)); diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp index 3124f9cf..0459c3ae 100644 --- a/test/libsolidity/SolidityEndToEndTest.cpp +++ b/test/libsolidity/SolidityEndToEndTest.cpp @@ -5354,6 +5354,25 @@ BOOST_AUTO_TEST_CASE(fixed_arrays_as_return_type) ); } +BOOST_AUTO_TEST_CASE(calldata_offset) +{ + // This tests a specific bug that was caused by not using the correct memory offset in the + // calldata unpacker. + char const* sourceCode = R"( + contract CB + { + address[] _arr; + string public last = "nd"; + function CB(address[] guardians) + { + _arr = guardians; + } + } + )"; + compileAndRun(sourceCode, 0, "CB", encodeArgs(u256(0x20))); + BOOST_CHECK(callContractFunction("last()", encodeArgs()) == encodeDyn(string("nd"))); +} + BOOST_AUTO_TEST_SUITE_END() } -- cgit v1.2.3