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 file missing error message on imports.

Browse Source 
Trying to convert an import path into a Boost canonical path causes
boost to throw an exception if the given file does not exist. Thus,
instead of geting to the 'File not found' error, we instead got into the
cath-all handler for 'Unknown exception in read callback'.

This change rearranges the file checks to happen before we create a
canonical Boost path. It also drive-by removes the unnecessary 'else'
block, as the body of the if is a guard-like return block.
This commit is contained in:
Sergiusz Bazanski 2017-10-03 18:48:53 +01:00 committed by Daniel Kirchner
parent 309a90bb5d
commit f39f36f2c7
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
solc/CommandLineInterface.cpp
View File

@ -700,7 +700,13 @@ bool CommandLineInterface::processInput()
try
{
auto path = boost::filesystem::path(_path);
if (!boost::filesystem::exists(path))
return ReadCallback::Result{false, "File not found."};
auto canonicalPath = boost::filesystem::canonical(path);
if (!boost::filesystem::is_regular_file(canonicalPath))
return ReadCallback::Result{false, "Not a valid file."};
bool isAllowed = false;
for (auto const& allowedDir: m_allowedDirectories)
{
@ -716,16 +722,10 @@ bool CommandLineInterface::processInput()
}
if (!isAllowed)
return ReadCallback::Result{false, "File outside of allowed directories."};
else if (!boost::filesystem::exists(path))
return ReadCallback::Result{false, "File not found."};
else if (!boost::filesystem::is_regular_file(canonicalPath))
return ReadCallback::Result{false, "Not a valid file."};
else
{
auto contents = dev::readFileAsString(canonicalPath.string());
m_sourceCodes[path.string()] = contents;
return ReadCallback::Result{true, contents};
}
auto contents = dev::readFileAsString(canonicalPath.string());
m_sourceCodes[path.string()] = contents;
return ReadCallback::Result{true, contents};
}
catch (Exception const& _exception)
{