Prevent from undefined behaviour during destruction of channel users

Change-Id: I07339e74068e066ec61a724b8a1ef6c2dd9670a0

diff --git a/src/client/impl/ApiInterfaceImpl.cpp b/src/client/impl/ApiInterfaceImpl.cpp
index 393924e04c95ba65fba38c5b199844b2ffb5af88..ec96944cfe7ff91669367a90ba538c6381db8219 100644 (file)
--- a/src/client/impl/ApiInterfaceImpl.cpp
+++ b/src/client/impl/ApiInterfaceImpl.cpp
@@ -68,8 +68,10 @@ namespace Client {
 
 ApiInterfaceImpl::ApiInterfaceImpl(const StatusCallbackClosure &statusClosure)
 : m_statusClosure(statusClosure)
-, m_channel(std::move(Protocol::ClientCallbacksPtr(new ClientCallbacks(this))))
 {
+    Protocol::ClientCallbacksPtr callbacks(new ClientCallbacks(this));
+    std::unique_ptr<Protocol::ClientChannel> channel(new Protocol::ClientChannel(std::move(callbacks)));
+    m_channel = std::move(channel);
 }
 
 ApiInterfaceImpl::~ApiInterfaceImpl()
@@ -80,11 +82,12 @@ ApiInterfaceImpl::~ApiInterfaceImpl()
     }
 
     m_callbacks.clear();
+    m_channel.reset();
 }
 
 int ApiInterfaceImpl::process(int fd, int events)
 {
-    return m_channel.process(fd, eventsToAskUserMask(events));
+    return m_channel->process(fd, eventsToAskUserMask(events));
 }
 
 askuser_check_result ApiInterfaceImpl::checkPrivilege(const std::string &privilege)
@@ -124,7 +127,7 @@ askuser_check_result ApiInterfaceImpl::checkPrivilege(const std::string &privile
 RequestId ApiInterfaceImpl::popupRequest(const PopupCallbackClosure &closure,
                                          const std::string &privilege)
 {
-    Client::RequestId id = static_cast<Client::RequestId>(m_channel.popupRequest(privilege));
+    Client::RequestId id = static_cast<Client::RequestId>(m_channel->popupRequest(privilege));
 
     auto it = m_callbacks.find(id);
     if (it != m_callbacks.end()) {

diff --git a/src/client/impl/ApiInterfaceImpl.h b/src/client/impl/ApiInterfaceImpl.h
index 0b45410f99f025230f5bad774e275af954784c13..2726a7675a310ed660a7cce590eb6da20225c983 100644 (file)
--- a/src/client/impl/ApiInterfaceImpl.h
+++ b/src/client/impl/ApiInterfaceImpl.h
@@ -55,7 +55,7 @@ public:
 
 private:
     StatusCallbackClosure m_statusClosure;
-    Protocol::ClientChannel m_channel;
+    std::unique_ptr<Protocol::ClientChannel> m_channel;
     std::map<RequestId, PopupCallbackClosure> m_callbacks;
 };
 

diff --git a/src/notification-daemon/Logic.cpp b/src/notification-daemon/Logic.cpp
index bf6b6708935c9293c92572e4a53d199113918ced..43300c7f524f364bcd016f44ba0839d5a20bd338 100644 (file)
--- a/src/notification-daemon/Logic.cpp
+++ b/src/notification-daemon/Logic.cpp
@@ -166,6 +166,11 @@ void Logic::popup(Protocol::ConnectionFd fd, Protocol::RequestId id, const std::
     addEvent({fd, id}, new EventPopupCheck(&m_popupper, pkgId, privilege));
 }
 
+Logic::~Logic()
+{
+    m_serverChannel.reset();
+}
+
 bool Logic::isEventProcessed() {
     return m_currentEvent.fd != Protocol::INVALID_FD;
 }

diff --git a/src/notification-daemon/Logic.h b/src/notification-daemon/Logic.h
index d05c04368795d81aec91f03029f340d70c273d25..be066cb1aaf3db07bf8bc7322e5b658942d0defe 100644 (file)
--- a/src/notification-daemon/Logic.h
+++ b/src/notification-daemon/Logic.h
@@ -52,7 +52,7 @@ public:
 
     void popup(Protocol::ConnectionFd fd, Protocol::RequestId id, const std::string &privilege);
 
-    ~Logic() {}
+    ~Logic();
 private:
     struct EventId {
         EventId() : fd(Protocol::INVALID_FD), id(Protocol::INVALID_ID) {}