Change to not use lazy release in channel class

It fixes memory leak in daemon

Change-Id: I3b2616f93e560b73cf0381a46aea4ba04ebe4170
Signed-off-by: TaeminYeom <taemin.yeom@samsung.com>

diff --git a/src/server/server_channel_handler.cpp b/src/server/server_channel_handler.cpp
index 07b268951297a5765b2fb413a767aacbdb872e76..2231bf91050ebd3cb364048fcf998c863f7085de 100644 (file)
--- a/src/server/server_channel_handler.cpp
+++ b/src/server/server_channel_handler.cpp
@@ -77,14 +77,8 @@ void server_channel_handler::disconnected(channel *ch)
                m_listener_ids.erase(ch);
        }
 
-       if (ch->loop()) {
-               ch->loop()->add_idle_event(0, [](size_t, void* data) {
-                       channel* c = (channel*)data;
-                       delete c;
-               },  ch);
-       } else {
+       if (!ch->loop())
                _D("Should not be here : channel[%p]", ch);
-       }
 }
 
 void server_channel_handler::read(channel *ch, message &msg)

diff --git a/src/shared/channel_event_handler.cpp b/src/shared/channel_event_handler.cpp
index 28f3398ca06a1aa7d4d3ffc520265f5776828b06..f7f32814a627b583143269922de706eee4feb82b 100644 (file)
--- a/src/shared/channel_event_handler.cpp
+++ b/src/shared/channel_event_handler.cpp
@@ -49,6 +49,7 @@ bool channel_event_handler::handle(int fd, event_condition condition)
        if (condition & (EVENT_HUP)) {
                _D("Disconnect[%p] : The other proccess is dead", this);
                m_ch->disconnect();
+               delete m_ch;
                m_ch = NULL;
                return false;
        }