ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-11-19 18:15:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix strict aliasing test failures with newer MSVC compilers

Browse Source
This commit is contained in:
greg7mdp
2022-04-21 11:45:48 -04:00
committed by manojsdoshi
parent 87d06a2571
commit dfe69f1b76
1 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/ripple/rpc/impl/RPCHelpers.cpp
View File

@@ -696,19 +696,31 @@ parseRippleLibSeed(Json::Value const& value)
std::optional<Seed>
getSeedFromRPC(Json::Value const& params, Json::Value& error)
{
// The array should be constexpr, but that makes Visual Studio unhappy.
static char const* const seedTypes[]{
jss::passphrase.c_str(), jss::seed.c_str(), jss::seed_hex.c_str()};
using string_to_seed_t =
std::function<std::optional<Seed>(std::string const&)>;
using seed_match_t = std::pair<char const*, string_to_seed_t>;
static seed_match_t const seedTypes[]{
{jss::passphrase.c_str(),
[](std::string const& s) { return parseGenericSeed(s); }},
{jss::seed.c_str(),
[](std::string const& s) { return parseBase58<Seed>(s); }},
{jss::seed_hex.c_str(), [](std::string const& s) {
uint128 i;
if (i.parseHex(s))
return std::optional<Seed>(Slice(i.data(), i.size()));
return std::optional<Seed>{};
}}};
// Identify which seed type is in use.
char const* seedType = nullptr;
seed_match_t const* seedType = nullptr;
int count = 0;
for (auto t : seedTypes)
for (auto const& t : seedTypes)
{
if (params.isMember(t))
if (params.isMember(t.first))
{
++count;
seedType = t;
seedType = &t;
}
}
@@ -722,28 +734,17 @@ getSeedFromRPC(Json::Value const& params, Json::Value& error)
}
// Make sure a string is present
if (!params[seedType].isString())
auto const& param = params[seedType->first];
if (!param.isString())
{
error = RPC::expected_field_error(seedType, "string");
error = RPC::expected_field_error(seedType->first, "string");
return std::nullopt;
}
auto const fieldContents = params[seedType].asString();
auto const fieldContents = param.asString();
// Convert string to seed.
std::optional<Seed> seed;
if (seedType == jss::seed.c_str())
seed = parseBase58<Seed>(fieldContents);
else if (seedType == jss::passphrase.c_str())
seed = parseGenericSeed(fieldContents);
else if (seedType == jss::seed_hex.c_str())
{
uint128 s;
if (s.parseHex(fieldContents))
seed.emplace(Slice(s.data(), s.size()));
}
std::optional<Seed> seed = seedType->second(fieldContents);
if (!seed)
error = rpcError(rpcBAD_SEED);
@@ -757,7 +758,6 @@ keypairForSignature(Json::Value const& params, Json::Value& error)
bool const has_key_type = params.isMember(jss::key_type);
// All of the secret types we allow, but only one at a time.
// The array should be constexpr, but that makes Visual Studio unhappy.
static char const* const secretTypes[]{
jss::passphrase.c_str(),
jss::secret.c_str(),
@@ -811,7 +811,9 @@ keypairForSignature(Json::Value const& params, Json::Value& error)
return {};
}
if (secretType == jss::secret.c_str())
// using strcmp as pointers may not match (see
// https://developercommunity.visualstudio.com/t/assigning-constexpr-char--to-static-cha/10021357?entry=problem)
if (strcmp(secretType, jss::secret.c_str()) == 0)
{
error = RPC::make_param_error(
"The secret field is not allowed if " +
@@ -823,7 +825,9 @@ keypairForSignature(Json::Value const& params, Json::Value& error)
// ripple-lib encodes seed used to generate an Ed25519 wallet in a
// non-standard way. While we never encode seeds that way, we try
// to detect such keys to avoid user confusion.
if (secretType != jss::seed_hex.c_str())
// using strcmp as pointers may not match (see
// https://developercommunity.visualstudio.com/t/assigning-constexpr-char--to-static-cha/10021357?entry=problem)
if (strcmp(secretType, jss::seed_hex.c_str()) != 0)
{
seed = RPC::parseRippleLibSeed(params[secretType]);