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 #2164 from ethereum/jsonio-catch-internal-exceptions

Browse Source 
JSON IO catch internal exceptions
This commit is contained in:
chriseth 2017-04-25 10:45:59 +02:00 committed by GitHub
commit c3b839ca75
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libsolidity/interface/StandardCompiler.cpp
View File

@ -181,6 +181,10 @@ Json::Value StandardCompiler::compileInternal(Json::Value const& _input)
for (auto const& sourceName: sources.getMemberNames()) for (auto const& sourceName: sources.getMemberNames())
{ {
string hash; string hash;
if (!sources[sourceName].isObject())
return formatFatalError("JSONError", "Source input is not a JSON object.");
if (sources[sourceName]["keccak256"].isString()) if (sources[sourceName]["keccak256"].isString())
hash = sources[sourceName]["keccak256"].asString(); hash = sources[sourceName]["keccak256"].asString();
@ -454,6 +458,14 @@ Json::Value StandardCompiler::compile(Json::Value const& _input)
{ {
return compileInternal(_input); return compileInternal(_input);
} }
catch (Json::LogicError const& _exception)
{
return formatFatalError("InternalCompilerError", string("JSON logic exception: ") + _exception.what());
}
catch (Json::RuntimeError const& _exception)
{
return formatFatalError("InternalCompilerError", string("JSON runtime exception: ") + _exception.what());
}
catch (Exception const& _exception) catch (Exception const& _exception)
{ {
return formatFatalError("InternalCompilerError", "Internal exception in StandardCompiler::compileInternal: " + boost::diagnostic_information(_exception)); return formatFatalError("InternalCompilerError", "Internal exception in StandardCompiler::compileInternal: " + boost::diagnostic_information(_exception));