Rectifyng this poniter deletion from member function

ASAN TFD289

Change-Id: I8261058c690244e6a21df616c67dae5dda1117ff

diff --git a/src/server/sensor_handler.cpp b/src/server/sensor_handler.cpp
index fcfef69772dd6f496e40c162fa85754aa30d1257..b9cdfcaa274990897f26bba6ab54d6c1127c5511 100644 (file)
--- a/src/server/sensor_handler.cpp
+++ b/src/server/sensor_handler.cpp
@@ -83,8 +83,10 @@ int sensor_handler::notify(const char *uri, sensor_data_t *data, int len)
        for (auto it = m_observers.begin(); it != m_observers.end(); ++it)
                (*it)->update(uri, msg);
 
-       if (msg->ref_count() == 0)
-               msg->unref();
+       if (msg->ref_count() == 0) {
+               delete msg;
+               msg = NULL;
+       }
 
        set_cache(data, len);
 

diff --git a/src/shared/channel.cpp b/src/shared/channel.cpp
index 446c881ded62c791247e0e5ce85270f51c77a24d..639e9c1cd73b1e8a8bd721b78d8df6e449e4b9a4 100644 (file)
--- a/src/shared/channel.cpp
+++ b/src/shared/channel.cpp
@@ -49,8 +49,13 @@ public:
                if (!m_ch->send_sync(m_msg))
                        return false;
 
-               if (m_msg)
+               if (m_msg) {
                        m_msg->unref();
+                       if(m_msg->ref_count() <= 0) {
+                               delete m_msg;
+                               m_msg = NULL;
+                       }
+               }
 
                return false;
        }

diff --git a/src/shared/message.cpp b/src/shared/message.cpp
index 799e64fe5d1dd57e95986e5cb14304794169f538..f53dd5e081539b023bf9b3b3fddafe85606313f3 100755 (executable)
--- a/src/shared/message.cpp
+++ b/src/shared/message.cpp
@@ -87,7 +87,7 @@ message::message(int error)
 
 message::~message()
 {
-       if (m_msg && ref_cnt == 0) {
+       if (m_msg) {
                delete [] m_msg;
                m_msg = NULL;
        }
@@ -146,12 +146,12 @@ void message::unref(void)
 {
        ref_cnt--;
 
-       if (ref_cnt > 0 || !m_msg)
+       /*if (ref_cnt > 0 || !m_msg)
                return;
 
        delete [] m_msg;
        m_msg = NULL;
-       delete this;
+       delete this;*/
 }
 
 int message::ref_count(void)