[Non-ACR][TFIVE-357]

Change-Id: Ice9b6976fca4013140b1fc90ffb88c4120e600c0
Signed-off-by: Abhishek Vijay <abhishek.v@samsung.com>

diff --git a/src/server/sensor_event_handler.cpp b/src/server/sensor_event_handler.cpp
index 4fac18d..73b5a05 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;
 
@@ -56,14 +56,18 @@ 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();
        }