LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Ensure returned path is not a dangerous one

Browse source 
Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>
This commit is contained in:
Anthony Fieroni 2020-02-04 18:49:33 +02:00
parent 776da644eb
commit 45064b6b7b
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/util.cpp
View file

@ -704,12 +704,14 @@ const fs::path &GetBlocksDir(bool fNetSpecific)
if (gArgs.IsArgSet("-blocksdir")) { if (gArgs.IsArgSet("-blocksdir")) {
path = fs::system_complete(gArgs.GetArg("-blocksdir", "")); path = fs::system_complete(gArgs.GetArg("-blocksdir", ""));
if (!fs::is_directory(path)) { if (!fs::is_directory(path)) {
path = ""; LogPrintf("%s: %s is not a directory, fallback to GetDataDir\n", __func__, path);
return path; path.clear();
} }
} else {
path = GetDataDir(false);
} }
if (path.empty())
path = GetDataDir(false);
if (fNetSpecific) if (fNetSpecific)
path /= BaseParams().DataDir(); path /= BaseParams().DataDir();
@ -733,12 +735,14 @@ const fs::path &GetDataDir(bool fNetSpecific)
if (gArgs.IsArgSet("-datadir")) { if (gArgs.IsArgSet("-datadir")) {
path = fs::system_complete(gArgs.GetArg("-datadir", "")); path = fs::system_complete(gArgs.GetArg("-datadir", ""));
if (!fs::is_directory(path)) { if (!fs::is_directory(path)) {
path = ""; LogPrintf("%s: %s is not a directory, fallback to GetDefaultDataDir\n", __func__, path);
return path; path.clear();
} }
} else {
path = GetDefaultDataDir();
} }
if (path.empty())
path = GetDefaultDataDir();
if (fNetSpecific) if (fNetSpecific)
path /= BaseParams().DataDir(); path /= BaseParams().DataDir();