handle file prefix

add the description to the changelog

fix: use the right method to search in string

follow the codestyle

using tabs

delete redundant declaration

implement the handling inline

Update Changelog.md

Co-Authored-By: Leonardo <leo@ethereum.org>
This commit is contained in:
ssi91 2020-04-17 03:29:40 +07:00
parent 99aa821410
commit 3d772edc7a
2 changed files with 5 additions and 1 deletions

View File

@ -15,6 +15,7 @@ Bugfixes:
* Type Checker: Fix several internal errors by performing size and recursiveness checks of types before the full type checking.
* Type Checker: Fix internal error when assigning to empty tuples.
* Type Checker: Perform recursiveness check on structs declared at the file level.
* Standard Json Input: Fix error when using prefix ``file://`` in the field ``urls``.
Build System:
* soltest.sh: ``SOLIDITY_BUILD_DIR`` is no longer relative to ``REPO_ROOT`` to allow for build directories outside of the source tree.

View File

@ -953,7 +953,10 @@ bool CommandLineInterface::processInput()
"ReadFile callback used as callback kind " +
_kind
));
auto path = boost::filesystem::path(_path);
string validPath = _path;
if (validPath.find("file://") == 0)
validPath.erase(0, 7);
auto path = boost::filesystem::path(validPath);
auto canonicalPath = boost::filesystem::weakly_canonical(path);
bool isAllowed = false;
for (auto const& allowedDir: m_allowedDirectories)