Kistler-Group/sdbus-cpp
1
0
Fork 1
mirror of https://github.com/Kistler-Group/sdbus-cpp.git synced 2025-07-30 10:07:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix #92: CallData race condition in Proxy::callMethod

Browse Source
This commit is contained in:
sangelovic
2020-04-02 20:46:38 +02:00
parent dc66efbbcb
commit e91bedd4cb
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Proxy.cpp
View File

@ -200,13 +200,15 @@ int Proxy::sdbus_async_reply_handler(sd_bus_message *sdbusMessage, void *userDat
assert(asyncCallData != nullptr); assert(asyncCallData != nullptr);
assert(asyncCallData->callback); assert(asyncCallData->callback);
auto& proxy = asyncCallData->proxy; auto& proxy = asyncCallData->proxy;
auto slot = asyncCallData->slot.get();
SCOPE_EXIT SCOPE_EXIT
{ {
// Slot may be null if we're doing blocking synchronous call implemented by means of asynchronous call, // Slot will be nullptr in case of synchronous call. In that case, the call data lives on the call stack,
// because in that case the call data is still alive on the stack, we don't need to manage it separately. // in another thread. But that thread may have already been woken up by now and cleared its call stack,
if (asyncCallData->slot) // so we can't access asyncCallData here. Hence we save the slot pointer at the beginning of this function.
proxy.pendingAsyncCalls_.removeCall(asyncCallData->slot.get()); if (slot)
proxy.pendingAsyncCalls_.removeCall(slot);
}; };
auto message = Message::Factory::create<MethodReply>(sdbusMessage, &proxy.connection_->getSdBusInterface()); auto message = Message::Factory::create<MethodReply>(sdbusMessage, &proxy.connection_->getSdBusInterface());