Skip to content

range-check uint16_t in the Any string to number fallback #1242

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

Open
aysha-afrah26 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

range-check uint16_t in the Any string to number fallback #1242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions include/behaviortree_cpp/utils/safe_any.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,12 +453,10 @@ inline nonstd::expected<T, std::string> Any::stringToNumber() const
#else
try
{
if constexpr(std::is_same_v<T, uint16_t>)
{
return std::stoul(str.toStdString());
}
if constexpr(std::is_integral_v<T>)
{
// convert<T>() rejects values that don't fit in T, matching the
// std::from_chars branch above.
const int64_t val = std::stol(str.toStdString());
Any temp_any(val);
return temp_any.convert<T>();
Expand Down
13 changes: 13 additions & 0 deletions tests/gtest_any.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,3 +269,16 @@ TEST(Any, StringToNumberIgnoresLocale)
EXPECT_EQ(Any(std::string("42")).cast<int>(), 42);
EXPECT_ANY_THROW(auto res = Any(std::string("fifty")).cast<double>());
}

TEST(Any, StringToUint16IsRangeChecked)
{
// A string that doesn't fit in uint16_t must be rejected, not wrapped.
EXPECT_EQ(Any(std::string("65535")).cast<uint16_t>(), 65535);
EXPECT_ANY_THROW(auto res = Any(std::string("65536")).cast<uint16_t>());
EXPECT_ANY_THROW(auto res = Any(std::string("70000")).cast<uint16_t>());
EXPECT_ANY_THROW(auto res = Any(std::string("-1")).cast<uint16_t>());

auto bb = Blackboard::create();
bb->set("value", std::string("70000"));
EXPECT_ANY_THROW(auto res = bb->get<uint16_t>("value"));
}
Loading