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

fix: invalid assert on event fd (#243)

Browse Source
This commit is contained in:
Michal Hučko
2022-02-13 18:48:50 +01:00
committed by GitHub
parent b7a9c63ff0
commit 5caea3b72b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Connection.cpp
View File

@@ -73,7 +73,7 @@ Connection::~Connection()
void Connection::requestName(const std::string& name) void Connection::requestName(const std::string& name)
{ {
SDBUS_CHECK_SERVICE_NAME(name); SDBUS_CHECK_SERVICE_NAME(name);
auto r = iface_->sd_bus_request_name(bus_.get(), name.c_str(), 0); auto r = iface_->sd_bus_request_name(bus_.get(), name.c_str(), 0);
SDBUS_THROW_ERROR_IF(r < 0, "Failed to request bus name", -r); SDBUS_THROW_ERROR_IF(r < 0, "Failed to request bus name", -r);
} }
@@ -423,7 +423,7 @@ bool Connection::processPendingRequest()
bool Connection::waitForNextRequest() bool Connection::waitForNextRequest()
{ {
assert(bus_ != nullptr); assert(bus_ != nullptr);
assert(eventFd_.fd != 0); assert(eventFd_.fd >= 0);
auto sdbusPollData = getEventLoopPollData(); auto sdbusPollData = getEventLoopPollData();
struct pollfd fds[] = { struct pollfd fds[] = {

2
src/Connection.h
View File

@@ -134,7 +134,7 @@ namespace sdbus::internal {
{ {
EventFd(); EventFd();
~EventFd(); ~EventFd();
int fd; int fd{-1};
}; };
private: private: