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 #5838 from maxsam4/useLiteralContent-patch

Browse Source 
useLiteralContent data validation
This commit is contained in:
chriseth 2019-01-23 10:35:32 +01:00 committed by GitHub
commit ea292393a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/interface/StandardCompiler.cpp
View File

@ -298,6 +298,8 @@ boost::optional<Json::Value> checkOptimizerKeys(Json::Value const& _input)
boost::optional<Json::Value> checkMetadataKeys(Json::Value const& _input)
{
if (_input.isObject() && _input.isMember("useLiteralContent") && !_input["useLiteralContent"].isBool())
return formatFatalError("JSONError", "\"settings.metadata.useLiteralContent\" must be Boolean");
static set<string> keys{"useLiteralContent"};
return checkKeys(_input, keys, "settings.metadata");
}

1
test/cmdlineTests/standard_missing_key_useLiteralContent/exit Normal file
View File

@ -0,0 +1 @@
0

19
test/cmdlineTests/standard_missing_key_useLiteralContent/input.json Normal file
View File

@ -0,0 +1,19 @@
{
"language": "Solidity",
"sources":
{
"A":
{
"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
}
},
"settings":
{
"optimizer": {
"enabled": true,
"runs": 200
},
"evmVersion": "byzantium",
"metadata": {}
}
}

1
test/cmdlineTests/standard_missing_key_useLiteralContent/output.json Normal file
View File

@ -0,0 +1 @@
{"sources":{"A":{"id":0}}}

1
test/cmdlineTests/standard_wrong_type_useLiteralContent/exit Normal file
View File

@ -0,0 +1 @@
0

21
test/cmdlineTests/standard_wrong_type_useLiteralContent/input.json Normal file
View File

@ -0,0 +1,21 @@
{
"language": "Solidity",
"sources":
{
"A":
{
"content": "pragma solidity >=0.0; contract C { function f() public pure {} }"
}
},
"settings":
{
"optimizer": {
"enabled": true,
"runs": 200
},
"evmVersion": "byzantium",
"metadata": {
"useLiteralContent": "literalContent"
}
}
}

1
test/cmdlineTests/standard_wrong_type_useLiteralContent/output.json Normal file
View File

@ -0,0 +1 @@
{"errors":[{"component":"general","formattedMessage":"\"settings.metadata.useLiteralContent\" must be Boolean","message":"\"settings.metadata.useLiteralContent\" must be Boolean","severity":"error","type":"JSONError"}]}