sensord: check NULL if memory allocation is failed

Change-Id: I9cbeba02e9e04f59182d0b3e9aa40ea349c9e2e1
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>

diff --git a/src/sensor/auto_rotation/auto_rotation_sensor.cpp b/src/sensor/auto_rotation/auto_rotation_sensor.cpp
index 107566b98cf98f6911c28a215736e26df7746a4c..4a7fec1852d556ca821ba7542a0ad9c587b20dab 100644 (file)
--- a/src/sensor/auto_rotation/auto_rotation_sensor.cpp
+++ b/src/sensor/auto_rotation/auto_rotation_sensor.cpp
@@ -137,10 +137,7 @@ void auto_rotation_sensor::synthesize(const sensor_event_t& event)
        int remains;
 
        rotation_event = (sensor_event_t *)malloc(sizeof(sensor_event_t));
-       if (!rotation_event) {
-               _E("Failed to allocate memory");
-               return;
-       }
+       retm_if(!rotation_event, "Failed to allocate memory");
 
        remains = get_data(&rotation_data, &data_length);
 
@@ -166,6 +163,7 @@ int auto_rotation_sensor::get_data(sensor_data_t **data, int *length)
 
        sensor_data_t *sensor_data;
        sensor_data = (sensor_data_t *)malloc(sizeof(sensor_data_t));
+       retvm_if(!sensor_data, -ENOMEM, "Failed to allocate memory");
 
        sensor_data->accuracy = SENSOR_ACCURACY_GOOD;
        sensor_data->timestamp = m_rotation_time;

diff --git a/src/sensor/gesture/face_down_sensor.cpp b/src/sensor/gesture/face_down_sensor.cpp
index 6bb53aff3f981ec33fd160d79ad6c36b1ad978da..c25f9d413f5546ab14b86d906fa6e103e82d47c6 100644 (file)
--- a/src/sensor/gesture/face_down_sensor.cpp
+++ b/src/sensor/gesture/face_down_sensor.cpp
@@ -121,10 +121,7 @@ void face_down_sensor::synthesize(const sensor_event_t & event)
        int data_length;
 
        face_down_event = (sensor_event_t *)malloc(sizeof(sensor_event_t));
-       if (!face_down_event) {
-               _E("Failed to allocate memory");
-               return;
-       }
+       retm_if(!face_down_event, "Failed to allocate memory");
 
        get_data(&face_down_data, &data_length);
        face_down_event->sensor_id = get_id();
@@ -141,6 +138,7 @@ int face_down_sensor::get_data(sensor_data_t ** data, int *length)
 {
        sensor_data_t *sensor_data;
        sensor_data = (sensor_data_t *)malloc(sizeof(sensor_data_t));
+       retvm_if(!sensor_data, -ENOMEM, "Failed to allocate memory");
 
        sensor_data->accuracy = SENSOR_ACCURACY_GOOD;
        sensor_data->timestamp = m_time;

diff --git a/src/sensor/gravity/gravity_sensor.cpp b/src/sensor/gravity/gravity_sensor.cpp
index 8ad7e006bf46c70f292aa458c0b0823168cc9cd1..a87a877c18d7c6e9f1952bb9a0e513a6a88e440f 100644 (file)
--- a/src/sensor/gravity/gravity_sensor.cpp
+++ b/src/sensor/gravity/gravity_sensor.cpp
@@ -414,6 +414,7 @@ int gravity_sensor::get_data(sensor_data_t **data, int *length)
 
        sensor_data_t *sensor_data;
        sensor_data = (sensor_data_t *)malloc(sizeof(sensor_data_t));
+       retvm_if(!sensor_data, -ENOMEM, "Failed to allocate memory");
 
        sensor_data->accuracy = m_accuracy;
        sensor_data->timestamp = m_time;

diff --git a/src/sensor/linear_accel/linear_accel_sensor.cpp b/src/sensor/linear_accel/linear_accel_sensor.cpp
index b8817066c4dba59c4baa7b21568adeb52e193b65..5df87d9912079617085b61850b874f5bf753e8be 100644 (file)
--- a/src/sensor/linear_accel/linear_accel_sensor.cpp
+++ b/src/sensor/linear_accel/linear_accel_sensor.cpp
@@ -163,6 +163,7 @@ int linear_accel_sensor::get_data(sensor_data_t **data, int *length)
 
        sensor_data_t *sensor_data;
        sensor_data = (sensor_data_t *)malloc(sizeof(sensor_data_t));
+       retvm_if(!sensor_data, -ENOMEM, "Failed to allocate memory");
 
        sensor_data->accuracy = SENSOR_ACCURACY_GOOD;
        sensor_data->timestamp = m_time;

diff --git a/src/sensor/orientation/orientation_sensor.cpp b/src/sensor/orientation/orientation_sensor.cpp
index 8d09b964402eb462419fbdb226325cf00ed4dd9d..8a567126f6a4104ca2bafc0c719cdcee178da36c 100644 (file)
--- a/src/sensor/orientation/orientation_sensor.cpp
+++ b/src/sensor/orientation/orientation_sensor.cpp
@@ -150,6 +150,7 @@ int orientation_sensor::get_data(sensor_data_t **data, int *length)
 
        sensor_data_t *sensor_data;
        sensor_data = (sensor_data_t *)malloc(sizeof(sensor_data_t));
+       retvm_if(!sensor_data, -ENOMEM, "Failed to allocate memory");
 
        sensor_data->accuracy = m_accuracy;
        sensor_data->timestamp = m_time;

diff --git a/src/sensor/rotation_vector/gyro_rv_sensor.cpp b/src/sensor/rotation_vector/gyro_rv_sensor.cpp
index 8c5fd23ee518f529b701ccd3e21b555787354f93..1be7042192d209cf51c53759b2f08d3d2364061f 100644 (file)
--- a/src/sensor/rotation_vector/gyro_rv_sensor.cpp
+++ b/src/sensor/rotation_vector/gyro_rv_sensor.cpp
@@ -161,6 +161,7 @@ int gyro_rv_sensor::get_data(sensor_data_t **data, int *length)
 {
        sensor_data_t *sensor_data;
        sensor_data = (sensor_data_t *)malloc(sizeof(sensor_data_t));
+       retvm_if(!sensor_data, -ENOMEM, "Failed to allocate memory");
 
        sensor_data->accuracy = m_accuracy;
        sensor_data->timestamp = m_time;

diff --git a/src/sensor/rotation_vector/magnetic_rv_sensor.cpp b/src/sensor/rotation_vector/magnetic_rv_sensor.cpp
index 6f28e6bf36d2160b592b8d81fea76fdd9041edaa..fd86b70129abc48857e0bee8231c343369212bb5 100644 (file)
--- a/src/sensor/rotation_vector/magnetic_rv_sensor.cpp
+++ b/src/sensor/rotation_vector/magnetic_rv_sensor.cpp
@@ -161,6 +161,7 @@ int magnetic_rv_sensor::get_data(sensor_data_t **data, int *length)
 {
        sensor_data_t *sensor_data;
        sensor_data = (sensor_data_t *)malloc(sizeof(sensor_data_t));
+       retvm_if(!sensor_data, -ENOMEM, "Failed to allocate memory");
 
        sensor_data->accuracy = m_accuracy;
        sensor_data->timestamp = m_time;

diff --git a/src/sensor/rotation_vector/rv_sensor.cpp b/src/sensor/rotation_vector/rv_sensor.cpp
index 75c7e1664864dd2713ef095676df713f97d0bc43..28277ba29dc65577698518164bd73529b7b7a5db 100644 (file)
--- a/src/sensor/rotation_vector/rv_sensor.cpp
+++ b/src/sensor/rotation_vector/rv_sensor.cpp
@@ -167,6 +167,7 @@ int rv_sensor::get_data(sensor_data_t **data, int *length)
 {
        sensor_data_t *sensor_data;
        sensor_data = (sensor_data_t *)malloc(sizeof(sensor_data_t));
+       retvm_if(!sensor_data, -ENOMEM, "Failed to allocate memory");
 
        sensor_data->accuracy = m_accuracy;
        sensor_data->timestamp = m_time;