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

Fix negative stack size checks.

Browse Source
This commit is contained in:
chriseth 2017-06-23 17:20:07 +02:00 committed by Alex Beregszaszi
parent 46caff4597
commit 168f64f4cb
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.md
View File

@ -28,6 +28,7 @@ Bugfixes:
* Fixed crash concerning non-callable types. * Fixed crash concerning non-callable types.
* Unused variable warnings no longer issued for variables used inside inline assembly. * Unused variable warnings no longer issued for variables used inside inline assembly.
* Code Generator: Fix ABI encoding of empty literal string. * Code Generator: Fix ABI encoding of empty literal string.
* Code Generator: Fix negative stack size checks.
* Inline Assembly: Enforce function arguments when parsing functional instructions. * Inline Assembly: Enforce function arguments when parsing functional instructions.
* Fixed segfault with constant function parameters * Fixed segfault with constant function parameters

1
libevmasm/Assembly.cpp
View File

@ -328,6 +328,7 @@ Json::Value Assembly::stream(ostream& _out, string const& _prefix, StringMap con
AssemblyItem const& Assembly::append(AssemblyItem const& _i) AssemblyItem const& Assembly::append(AssemblyItem const& _i)
{ {
assertThrow(m_deposit >= 0, AssemblyException, "");
m_deposit += _i.deposit(); m_deposit += _i.deposit();
m_items.push_back(_i); m_items.push_back(_i);
if (m_items.back().location().isEmpty() && !m_currentSourceLocation.isEmpty()) if (m_items.back().location().isEmpty() && !m_currentSourceLocation.isEmpty())

10
libsolidity/codegen/ContractCompiler.cpp
View File

@ -267,12 +267,16 @@ void ContractCompiler::appendFunctionSelector(ContractDefinition const& _contrac
m_context << notFound; m_context << notFound;
if (fallback) if (fallback)
{ {
m_context.setStackOffset(0);
if (!fallback->isPayable()) if (!fallback->isPayable())
appendCallValueCheck(); appendCallValueCheck();
eth::AssemblyItem returnTag = m_context.pushNewTag(); eth::AssemblyItem returnTag = m_context.pushNewTag();
fallback->accept(*this); fallback->accept(*this);
m_context << returnTag; m_context << returnTag;
m_context.adjustStackOffset(
CompilerUtils(m_context).sizeOnStack(FunctionType(*fallback).returnParameterTypes()) - 1
);
appendReturnValuePacker(FunctionType(*fallback).returnParameterTypes(), _contract.isLibrary()); appendReturnValuePacker(FunctionType(*fallback).returnParameterTypes(), _contract.isLibrary());
} }
else else
@ -285,6 +289,7 @@ void ContractCompiler::appendFunctionSelector(ContractDefinition const& _contrac
CompilerContext::LocationSetter locationSetter(m_context, functionType->declaration()); CompilerContext::LocationSetter locationSetter(m_context, functionType->declaration());
m_context << callDataUnpackerEntryPoints.at(it.first); m_context << callDataUnpackerEntryPoints.at(it.first);
m_context.setStackOffset(0);
// We have to allow this for libraries, because value of the previous // We have to allow this for libraries, because value of the previous
// call is still visible in the delegatecall. // call is still visible in the delegatecall.
if (!functionType->isPayable() && !_contract.isLibrary()) if (!functionType->isPayable() && !_contract.isLibrary())
@ -295,6 +300,11 @@ void ContractCompiler::appendFunctionSelector(ContractDefinition const& _contrac
appendCalldataUnpacker(functionType->parameterTypes()); appendCalldataUnpacker(functionType->parameterTypes());
m_context.appendJumpTo(m_context.functionEntryLabel(functionType->declaration())); m_context.appendJumpTo(m_context.functionEntryLabel(functionType->declaration()));
m_context << returnTag; m_context << returnTag;
m_context.adjustStackOffset(
CompilerUtils(m_context).sizeOnStack(functionType->returnParameterTypes()) -
CompilerUtils(m_context).sizeOnStack(functionType->parameterTypes()) -
1
);
appendReturnValuePacker(functionType->returnParameterTypes(), _contract.isLibrary()); appendReturnValuePacker(functionType->returnParameterTypes(), _contract.isLibrary());
} }
} }

1
libsolidity/codegen/ExpressionCompiler.cpp
View File

@ -88,6 +88,7 @@ void ExpressionCompiler::appendStateVariableAccessor(VariableDeclaration const&
FunctionType accessorType(_varDecl); FunctionType accessorType(_varDecl);
TypePointers paramTypes = accessorType.parameterTypes(); TypePointers paramTypes = accessorType.parameterTypes();
m_context.adjustStackOffset(1 + CompilerUtils::sizeOnStack(paramTypes));
// retrieve the position of the variable // retrieve the position of the variable
auto const& location = m_context.storageLocationOfVariable(_varDecl); auto const& location = m_context.storageLocationOfVariable(_varDecl);