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

Ensure that public callable parameters are valid for calldata.

Browse Source
This commit is contained in:
Daniel Kirchner 2020-04-16 16:29:23 +02:00
parent 6093982606
commit f6d1cee06b
5 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/analysis/TypeChecker.cpp
View File

@ -488,6 +488,8 @@ bool TypeChecker::visit(VariableDeclaration const& _variable)
if (auto referenceType = dynamic_cast<ReferenceType const*>(varType)) if (auto referenceType = dynamic_cast<ReferenceType const*>(varType))
{ {
auto result = referenceType->validForLocation(referenceType->location()); auto result = referenceType->validForLocation(referenceType->location());
if (result && _variable.isPublicCallableParameter())
result = referenceType->validForLocation(DataLocation::CallData);
if (!result) if (!result)
{ {
solAssert(!result.message().empty(), "Expected detailed error message"); solAssert(!result.message().empty(), "Expected detailed error message");

12
libsolidity/ast/AST.cpp
View File

@ -559,6 +559,18 @@ bool VariableDeclaration::isExternalCallableParameter() const
return false; return false;
} }
bool VariableDeclaration::isPublicCallableParameter() const
{
if (!isCallableOrCatchParameter())
return false;
if (auto const* callable = dynamic_cast<CallableDeclaration const*>(scope()))
if (callable->visibility() == Visibility::Public)
return !isReturnParameter();
return false;
}
bool VariableDeclaration::isInternalCallableParameter() const bool VariableDeclaration::isInternalCallableParameter() const
{ {
if (!isCallableOrCatchParameter()) if (!isCallableOrCatchParameter())

2
libsolidity/ast/AST.h
View File

@ -914,6 +914,8 @@ public:
/// @returns true if this variable is a parameter (not return parameter) of an external function. /// @returns true if this variable is a parameter (not return parameter) of an external function.
/// This excludes parameters of external function type names. /// This excludes parameters of external function type names.
bool isExternalCallableParameter() const; bool isExternalCallableParameter() const;
/// @returns true if this variable is a parameter (not return parameter) of a public function.
bool isPublicCallableParameter() const;
/// @returns true if this variable is a parameter or return parameter of an internal function /// @returns true if this variable is a parameter or return parameter of an internal function
/// or a function type of internal visibility. /// or a function type of internal visibility.
bool isInternalCallableParameter() const; bool isInternalCallableParameter() const;

2
libsolutil/Result.h
View File

@ -36,7 +36,7 @@ namespace solidity::util
/// ///
template <class ResultType> template <class ResultType>
class Result class [[nodiscard]] Result
{ {
public: public:
/// Constructs a result with _value and an empty message. /// Constructs a result with _value and an empty message.

2
test/libsolidity/syntaxTests/array/length/parameter_too_large_multidim.sol
View File

@ -2,8 +2,10 @@ contract C {
function f(bytes32[1263941234127518272][500] memory) public pure {} function f(bytes32[1263941234127518272][500] memory) public pure {}
function f(uint[2**30][] memory) public pure {} function f(uint[2**30][] memory) public pure {}
function f(uint[2**30][2**30][] memory) public pure {} function f(uint[2**30][2**30][] memory) public pure {}
function f(uint[2**16][2**16][] memory) public pure {}
} }
// ---- // ----
// TypeError: (26-66): Type too large for memory. // TypeError: (26-66): Type too large for memory.
// TypeError: (96-116): Type too large for memory. // TypeError: (96-116): Type too large for memory.
// TypeError: (146-173): Type too large for memory. // TypeError: (146-173): Type too large for memory.
// TypeError: (203-230): Type too large for calldata.