Skip to content

Resolve rpc model serialization infinite recursion. #696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 2 commits into from
Dec 31, 2025
Merged

Resolve rpc model serialization infinite recursion. #696

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fd9f95
Style.
evoskuil Dec 31, 2025
65c2b9b
Resolve rpc model serialization infinite recursion.
evoskuil Dec 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 30 additions & 18 deletions src/messages/rpc/model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ DEFINE_JSON_TO_TAG(version)
// value_t
// ----------------------------------------------------------------------------

BC_PUSH_WARNING(NO_STATIC_CAST)
BC_PUSH_WARNING(NO_CASTS_FOR_ARITHMETIC_CONVERSION)

DEFINE_JSON_FROM_TAG(value_t)
{
// In the general model, all numbers serialize to double.
Expand All @@ -75,52 +78,61 @@ DEFINE_JSON_FROM_TAG(value_t)
},
[&](int8_t visit) THROWS
{
value = value_from(visit).as_double();
value = static_cast<double>(visit);
},
[&](int16_t visit) THROWS
{
value = value_from(visit).as_double();
value = static_cast<double>(visit);
},
[&](int32_t visit) THROWS
{
value = value_from(visit).as_double();
value = static_cast<double>(visit);
},
[&](int64_t visit) THROWS
{
value = value_from(visit).as_double();
value = static_cast<double>(visit);
},
[&](uint8_t visit) THROWS
{
value = value_from(visit).as_double();
value = static_cast<double>(visit);
},
[&](uint16_t visit) THROWS
{
value = value_from(visit).as_double();
value = static_cast<double>(visit);
},
[&](uint32_t visit) THROWS
{
value = value_from(visit).as_double();
value = static_cast<double>(visit);
},
[&](uint64_t visit) THROWS
{
value = value_from(visit).as_double();
value = static_cast<double>(visit);
},

[&](const string_t& visit) THROWS
{
value = visit;
},
[&](const array_t& visit) THROWS
{
value = value_from(visit);
value.emplace_array();
auto& array = value.as_array();
array.reserve(visit.size());
for (const auto& element: visit)
array.push_back(value_from(element));
},
[&](const object_t& visit) THROWS
{
value = value_from(visit);
value.emplace_object();
auto& object = value.as_object();
for (const auto& pair: visit)
object.emplace(pair.first, value_from(pair.second));
}
}, instance.value());
}

BC_POP_WARNING()
BC_POP_WARNING()

DEFINE_JSON_TO_TAG(value_t)
{
if (value.is_null())
Expand Down Expand Up @@ -297,23 +309,23 @@ DEFINE_JSON_FROM_TAG(response_t)

if (instance.error.has_value())
{
const auto& result = instance.error.value();
const auto& error = instance.error.value();

if (result.data.has_value())
if (error.data.has_value())
{
object["error"] =
{
{ "code", result.code },
{ "message", result.message },
{ "data", value_from(result.data.value()) }
{ "code", error.code },
{ "message", error.message },
{ "data", value_from(error.data.value()) }
};
}
else
{
object["error"] =
{
{ "code", result.code },
{ "message", result.message }
{ "code", error.code },
{ "message", error.message }
};
}
}
Expand Down
Loading