Fix memory leak

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

diff --git a/src/shared/channel.cpp b/src/shared/channel.cpp
index 10ed266bb060d61d2f951141d53f974363fa2e6b..fc7940e2a0d81b7ddec2ef27484db09483a7dd5c 100644 (file)
--- a/src/shared/channel.cpp
+++ b/src/shared/channel.cpp
@@ -181,6 +181,8 @@ void channel::disconnect(void)
        if (m_handler) {
                _D("Disconnect channel[%p] handler[%p]", this, m_handler);
                m_handler->disconnected(this);
+               if (!m_loop)
+                       delete m_handler;
                m_handler = NULL;
        }
 

diff --git a/src/shared/event_loop.cpp b/src/shared/event_loop.cpp
index a60ba38f9c15046f3fc721b9d14375a8710d25d5..840ec2a621db670904c00416668c4be8ab78af6c 100644 (file)
--- a/src/shared/event_loop.cpp
+++ b/src/shared/event_loop.cpp
@@ -222,19 +222,7 @@ void event_loop::release_info(handler_info *info)
        g_io_channel_unref(info->g_ch);
 
        info->g_ch = NULL;
-       channel_event_handler *ce_handler = nullptr;
-       ce_handler = dynamic_cast<channel_event_handler *>(info->handler);
-       if (ce_handler) {
-               // _D("Add idle event for lazy release : handler[%p] event[%llu]", ce_handler, info->id);
-               add_idle_event(0, [](size_t, void *data) {
-                       channel_event_handler *handler = (channel_event_handler *)data;
-                       delete handler;
-               }, ce_handler);
-       } else {
-               // _D("Release handler[%p] event[%llu]", info->handler, info->id);
-               delete info->handler;
-       }
-
+       delete info->handler;
        info->handler = NULL;
 
        delete info;