feedc0de/sdbus-cpp
1
0
Fork 0
forked from Kistler-Group/sdbus-cpp
Code Pull Requests Activity

Fix potential UB in creation of sdbus::Error.

Browse Source 
See https://github.com/Kistler-Group/sdbus-cpp/issues/231
This commit is contained in:
Benjamin Kaufmann
2022-01-10 17:44:47 +01:00
committed by Stanislav Angelovič
parent bca8e81037
commit f673e57a47
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/sdbus-c++/Error.h
View File

@ -43,6 +43,11 @@ namespace sdbus {
: public std::runtime_error : public std::runtime_error
{ {
public: public:
explicit Error(const std::string& name, const char* message = nullptr)
: Error(name, std::string(message ? message : ""))
{
}
Error(const std::string& name, const std::string& message) Error(const std::string& name, const std::string& message)
: std::runtime_error("[" + name + "] " + message) : std::runtime_error("[" + name + "] " + message)
, name_(name) , name_(name)

18
tests/unittests/Types_test.cpp
View File

@ -344,3 +344,21 @@ TEST(AUnixFd, TakesOverNewFdAndClosesOriginalFdOnAdoptingReset)
EXPECT_THAT(unixFd.get(), Eq(newFd)); EXPECT_THAT(unixFd.get(), Eq(newFd));
EXPECT_THAT(::close(fd), Eq(-1)); EXPECT_THAT(::close(fd), Eq(-1));
} }
TEST(AnError, CanBeConstructedFromANameAndAMessage)
{
auto error = sdbus::Error("name", "message");
EXPECT_THAT(error.getName(), Eq<std::string>("name"));
EXPECT_THAT(error.getMessage(), Eq<std::string>("message"));
}
TEST(AnError, CanBeConstructedFromANameOnly)
{
auto error1 = sdbus::Error("name");
auto error2 = sdbus::Error("name", nullptr);
EXPECT_THAT(error1.getName(), Eq<std::string>("name"));
EXPECT_THAT(error2.getName(), Eq<std::string>("name"));
EXPECT_THAT(error1.getMessage(), Eq<std::string>(""));
EXPECT_THAT(error2.getMessage(), Eq<std::string>(""));
}