mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-02-23 12:33:26 -05:00

Add more fs::path operator/ and operator+ overloads to prevent unsafe string->path conversions on Windows that would cause strings to be decoded according to the current Windows locale & code page instead of the correct string encoding. Update application code to deal with loss of implicit string->path conversions by calling fs::u8path or fs::PathFromString explicitly, or by just changing variable types from std::string to fs::path to avoid conversions altoghther, or make them happen earlier. In all cases, there's no change in behavior either (1) because strings only contained ASCII characters and would be decoded the same regardless of what encoding was used, or (2) because of the 1:1 mapping between paths and strings using the PathToString and PathFromString functions. Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
51 lines
1.7 KiB
C++
51 lines
1.7 KiB
C++
// Copyright (c) 2018-2021 The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#include <fs.h>
|
|
#include <univalue.h>
|
|
#include <util/check.h>
|
|
#include <util/system.h>
|
|
|
|
#include <fstream>
|
|
#include <string>
|
|
|
|
#include <wallet/test/init_test_fixture.h>
|
|
|
|
namespace wallet {
|
|
InitWalletDirTestingSetup::InitWalletDirTestingSetup(const std::string& chainName) : BasicTestingSetup(chainName)
|
|
{
|
|
m_wallet_loader = MakeWalletLoader(*m_node.chain, m_args);
|
|
|
|
const auto sep = fs::path::preferred_separator;
|
|
|
|
m_datadir = m_args.GetDataDirNet();
|
|
m_cwd = fs::current_path();
|
|
|
|
m_walletdir_path_cases["default"] = m_datadir / "wallets";
|
|
m_walletdir_path_cases["custom"] = m_datadir / "my_wallets";
|
|
m_walletdir_path_cases["nonexistent"] = m_datadir / "path_does_not_exist";
|
|
m_walletdir_path_cases["file"] = m_datadir / "not_a_directory.dat";
|
|
m_walletdir_path_cases["trailing"] = (m_datadir / "wallets") + sep;
|
|
m_walletdir_path_cases["trailing2"] = (m_datadir / "wallets") + sep + sep;
|
|
|
|
fs::current_path(m_datadir);
|
|
m_walletdir_path_cases["relative"] = "wallets";
|
|
|
|
fs::create_directories(m_walletdir_path_cases["default"]);
|
|
fs::create_directories(m_walletdir_path_cases["custom"]);
|
|
fs::create_directories(m_walletdir_path_cases["relative"]);
|
|
std::ofstream f{m_walletdir_path_cases["file"]};
|
|
f.close();
|
|
}
|
|
|
|
InitWalletDirTestingSetup::~InitWalletDirTestingSetup()
|
|
{
|
|
fs::current_path(m_cwd);
|
|
}
|
|
|
|
void InitWalletDirTestingSetup::SetWalletDir(const fs::path& walletdir_path)
|
|
{
|
|
m_args.ForceSetArg("-walletdir", fs::PathToString(walletdir_path));
|
|
}
|
|
} // namespace wallet
|