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

Prevent adding '-' CLI flag to allowed paths as if it was an actual file

Browse Source 
- This resulted in a bug where using stdin was effectively disabling allowed path checks.
This commit is contained in:
Kamil Śliwak
2021-04-19 16:58:48 +02:00
parent 6ef7e39e46
commit 0d4871ad10
7 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
solc/CommandLineInterface.cpp
+4 -5
View File
@@ -585,15 +585,15 @@ bool CommandLineInterface::readInputFilesAndConfigureRemappings()
if (eq != path.end())
{
if (auto r = ImportRemapper::parseRemapping(path))
{
m_remappings.emplace_back(std::move(*r));
path = string(eq + 1, path.end());
}
else
{
serr() << "Invalid remapping: \"" << path << "\"." << endl;
return false;
}
string remappingTarget(eq + 1, path.end());
m_fileReader.allowDirectory(boost::filesystem::path(remappingTarget).remove_filename());
}
else if (path == "-")
addStdin = true;
@@ -628,9 +628,8 @@ bool CommandLineInterface::readInputFilesAndConfigureRemappings()
// NOTE: we ignore the FileNotFound exception as we manually check above
m_fileReader.setSource(infile, readFileAsString(infile.string()));
path = boost::filesystem::canonical(infile).string();
m_fileReader.allowDirectory(boost::filesystem::path(boost::filesystem::canonical(infile).string()).remove_filename());
}
m_fileReader.allowDirectory(boost::filesystem::path(path).remove_filename());
}
if (addStdin)