[Tizen 5.0] Sensord: Fix memory leak

[platform/core/system/sensord.git] / src / server / sensor_event_handler.cpp

diff --git a/src/server/sensor_event_handler.cpp b/src/server/sensor_event_handler.cpp
index 4fac18d..a3422a7 100644 (file)
--- a/src/server/sensor_event_handler.cpp
+++ b/src/server/sensor_event_handler.cpp
@@ -35,7 +35,7 @@ sensor_event_handler::sensor_event_handler(physical_sensor_handler *sensor)
 bool sensor_event_handler::handle(int fd, ipc::event_condition condition)
 {
        sensor_info info;
-       sensor_data_t *data;
+       sensor_data_t *data = NULL;
        int length = 0;
        int remains = 1;
 
@@ -45,7 +45,10 @@ bool sensor_event_handler::handle(int fd, ipc::event_condition condition)
        auto result = std::find(std::begin(ids), std::end(ids), m_sensor->get_hal_id());
 
        if (result == std::end(ids))
+       {
+               ids.clear();
                return true;
+       }
 
        while (remains > 0) {
                remains = m_sensor->get_data(&data, &length);
@@ -56,17 +59,23 @@ bool sensor_event_handler::handle(int fd, ipc::event_condition condition)
 
                if (m_sensor->on_event(data, length, remains) < 0) {
                        free(data);
+                       data = NULL;
                        continue;
                }
 
                info = m_sensor->get_sensor_info();
 
                //_I("[Data] allocate %p", data);
-               if (m_sensor->notify(info.get_uri().c_str(), data, length) < 0) {
-                       free(data);
+               if (data) {
+                       if (m_sensor->notify(info.get_uri().c_str(), data, length) < 0) {
+                               free(data);
+                               data = NULL;
+                       }
                }
                info.clear();
        }
 
+       ids.clear();
+
        return true;
 }