cerc-io/solidity
10
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

Bail out when faced with merge involving an implemented contract function with an unimplemented one

Browse Source
This commit is contained in:
Bhargava Shastry 2020-04-16 10:46:38 +02:00
parent 7aa305b487
commit eb3672b522
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/tools/ossfuzz/SolProtoAdaptor.cpp
View File

@ -887,6 +887,12 @@ void SolContract::merge()
);
// Merge interface into contract instead of the other way round
g->merge(*function);
// If abstract contract, we may implement
bool implement = abstract() ? coinToss() : true;
// If merged function has already been implemented
// we must implement.
if (g->implemented() && !implement)
implement = true;
// Create new contract function
mergedContract = make_shared<SolContractFunction>(
SolContractFunction(
@ -895,7 +901,7 @@ void SolContract::merge()
name(),
g->name(),
SolContractFunction::Type::EXPLICITOVERRIDECONTRACT,
abstract() ? coinToss() : true,
implement,
coinToss(),
newReturnValue(),
g->visibility()
@ -931,6 +937,13 @@ void SolContract::merge()
#if 0
std::cout << "Overridden from " << function->overriddenFromBaseNames() << std::endl;
#endif
// If abstract contract, we may implement
bool implement = abstract() ? coinToss() : true;
// If merged function has already been implemented
// we must implement.
if (function->implemented() && !implement)
implement = true;
// Create new contract function
mergedContract = make_shared<SolContractFunction>(
SolContractFunction(
@ -939,7 +952,7 @@ void SolContract::merge()
name(),
function->name(),
SolContractFunction::Type::EXPLICITOVERRIDECONTRACT,
abstract() ? coinToss() : true,
implement,
coinToss(),
newReturnValue(),
function->visibility()
@ -967,7 +980,20 @@ void SolContract::merge()
langutil::FuzzerError,
"Sol proto fuzzer: n-way merge of non-virtual contract function is not possible"
);
// Assert contract functions are both implemented or unimplemented
assertThrow(
g->implemented() == function->implemented(),
langutil::FuzzerError,
"Sol proto fuzzer: n-way merge of an implemented contract function with an unimplemented contract function is not possible"
);
function->merge(*g);
// If abstract contract, we may implement
bool implement = abstract() ? coinToss() : true;
// If merged function has already been implemented
// we must implement.
if (function->implemented() && !implement)
implement = true;
// Create new contract function
mergedContract = make_shared<SolContractFunction>(
SolContractFunction(
@ -976,7 +1002,7 @@ void SolContract::merge()
name(),
function->name(),
SolContractFunction::Type::EXPLICITOVERRIDECONTRACT,
abstract() ? coinToss() : true,
implement,
coinToss(),
newReturnValue(),
function->visibility()