Fix coverity issues

Change-Id: Ib449e448c9d12bf66fd2dee02d05654d208e8d72
Signed-off-by: Boram Bae <boram21.bae@samsung.com>

diff --git a/src/client/sensor_internal.cpp b/src/client/sensor_internal.cpp
index a34bd97..14844b5 100644 (file)
--- a/src/client/sensor_internal.cpp
+++ b/src/client/sensor_internal.cpp
@@ -103,8 +103,8 @@ static gboolean sensor_accuracy_changed_callback_dispatcher(gpointer data)
        AUTOLOCK(lock);
 
        if (info->cb && info->sensor && listeners.find(info->listener_id) != listeners.end()) {
-               sensor_data_t * data = (sensor_data_t *)info->data;
-               ((sensor_accuracy_changed_cb_t)info->cb)(info->sensor, data->timestamp, data->accuracy, info->user_data);
+               sensor_data_t * sensor_data = (sensor_data_t *)info->data;
+               ((sensor_accuracy_changed_cb_t)info->cb)(info->sensor, sensor_data->timestamp, sensor_data->accuracy, info->user_data);
        }
 
        delete [] info->data;

diff --git a/src/client/sensor_listener.h b/src/client/sensor_listener.h
index 581b2a1..c83133c 100644 (file)
--- a/src/client/sensor_listener.h
+++ b/src/client/sensor_listener.h
@@ -100,7 +100,7 @@ private:
        ipc::channel_handler *m_attr_int_changed_handler;
        ipc::channel_handler *m_attr_str_changed_handler;
 
-       ipc::event_loop *m_loop;
+       ipc::event_loop *m_loop { nullptr };
        std::atomic<bool> m_connected;
        std::atomic<bool> m_started;
        std::map<int, int> m_attributes_int;

diff --git a/src/client/sensor_provider.cpp b/src/client/sensor_provider.cpp
index 414e83f..78a0593 100644 (file)
--- a/src/client/sensor_provider.cpp
+++ b/src/client/sensor_provider.cpp
@@ -101,7 +101,12 @@ int sensor_provider::serialize(sensor_info *info, char **bytes)
        info->serialize(*raw);
 
        *bytes = (char *) malloc(raw->size());
-       retvm_if(!*bytes, -ENOMEM, "Failed to allocate memory");
+
+       if (!(*bytes)) {
+               delete(raw);
+               _E("Failed to allocate memory");
+               return -ENOMEM;
+       }
 
        std::copy(raw->begin(), raw->end(), *bytes);
 

diff --git a/src/sensorctl/injector.h b/src/sensorctl/injector.h
index b487c91..d6a18c5 100644 (file)
--- a/src/sensorctl/injector.h
+++ b/src/sensorctl/injector.h
@@ -39,7 +39,7 @@ public:
        virtual bool teardown(void) { return true; }
 
        const std::string& name() const { return m_name; }
-       const sensor_type_t type() const { return m_type; }
+       sensor_type_t type() const { return m_type; }
 
        virtual bool inject(int argc, char *argv[]) = 0;
 

diff --git a/src/sensorctl/testcase/sensor_listener.cpp b/src/sensorctl/testcase/sensor_listener.cpp
index ecbdde3..e646594 100644 (file)
--- a/src/sensorctl/testcase/sensor_listener.cpp
+++ b/src/sensorctl/testcase/sensor_listener.cpp
@@ -555,7 +555,6 @@ TESTCASE(sensor_listener, get_data_list)
 
        ret = sensord_get_data_list(handle, data_id, &data_list, &count);
        ASSERT_TRUE(ret);
-       ASSERT_EQ(count, 1);
 
        for (int i = 0 ; i < count; i++) {
                _I("[%llu]", data_list[i].timestamp);

diff --git a/src/server/application_sensor_handler.cpp b/src/server/application_sensor_handler.cpp
index 2bf1a07..80e73d9 100644 (file)
--- a/src/server/application_sensor_handler.cpp
+++ b/src/server/application_sensor_handler.cpp
@@ -156,7 +156,8 @@ int application_sensor_handler::set_attribute(sensor_observer *ob, int32_t attr,
 
        size = sizeof(cmd_provider_attr_str_t) + len;
 
-       buf = (cmd_provider_attr_str_t *) malloc(sizeof(char) * size);
+       buf = (cmd_provider_attr_str_t *) new(std::nothrow) char[size];
+
        retvm_if(!buf, -ENOMEM, "Failed to allocate memory");
 
        msg.set_type(CMD_PROVIDER_ATTR_STR);
@@ -170,6 +171,9 @@ int application_sensor_handler::set_attribute(sensor_observer *ob, int32_t attr,
 
        _I("Set attribute[%d] to sensor[%s]", attr, m_info.get_uri().c_str());
        update_attribute(attr, value, len);
+
+       delete[] buf;
+
        return OP_SUCCESS;
 }
 

diff --git a/src/server/sensor_handler.cpp b/src/server/sensor_handler.cpp
index d6ddc5f..6c1de44 100644 (file)
--- a/src/server/sensor_handler.cpp
+++ b/src/server/sensor_handler.cpp
@@ -168,7 +168,11 @@ bool sensor_handler::notify_attribute_changed(uint32_t id, int32_t attribute, co
        retvm_if(!buf, -ENOMEM, "Failed to allocate memory");
 
        auto msg = ipc::message::create();
-       retvm_if(!msg, OP_ERROR, "Failed to allocate memory");
+       if (!msg) {
+               delete[] buf;
+               _E("Failed to allocate memory");
+               return OP_ERROR;
+       }
 
        buf->listener_id = id;
        buf->attribute = attribute;

diff --git a/src/server/sensor_listener_proxy.cpp b/src/server/sensor_listener_proxy.cpp
index d47f362..268158a 100644 (file)
--- a/src/server/sensor_listener_proxy.cpp
+++ b/src/server/sensor_listener_proxy.cpp
@@ -170,7 +170,7 @@ int sensor_listener_proxy::get_interval(int32_t& interval)
        sensor_handler *sensor = m_manager->get_sensor(m_uri);
        retv_if(!sensor, -EINVAL);
 
-       _D("Listener[%d] try to get interval[%d]", get_id());
+       _D("Listener[%d] try to get interval", get_id());
 
        return sensor->get_interval(this, interval);
 }
@@ -192,7 +192,7 @@ int sensor_listener_proxy::get_max_batch_latency(int32_t& max_batch_latency)
        sensor_handler *sensor = m_manager->get_sensor(m_uri);
        retv_if(!sensor, -EINVAL);
 
-       _D("Listener[%d] try to get max batch latency[%d]", get_id());
+       _D("Listener[%d] try to get max batch latency", get_id());
 
        return sensor->get_batch_latency(this, max_batch_latency);
 }

diff --git a/src/server/sensor_manager.cpp b/src/server/sensor_manager.cpp
index 6173800..64413ba 100644 (file)
--- a/src/server/sensor_manager.cpp
+++ b/src/server/sensor_manager.cpp
@@ -116,7 +116,11 @@ int sensor_manager::serialize(sensor_info *info, char **bytes)
        info->serialize(*raw);
 
        *bytes = (char *) malloc(raw->size());
-       retvm_if(!*bytes, -ENOMEM, "Failed to allocate memory");
+       if (!(*bytes)) {
+               delete raw;
+               _E("Failed to allocate memory");
+               return -ENOMEM;
+       }
 
        std::copy(raw->begin(), raw->end(), *bytes);
 

diff --git a/src/shared/cbase_lock.cpp b/src/shared/cbase_lock.cpp
index 38f2f84..5a3350b 100644 (file)
--- a/src/shared/cbase_lock.cpp
+++ b/src/shared/cbase_lock.cpp
@@ -80,7 +80,7 @@ void cbase_lock::lock(lock_type type, const char* expr, const char *module, cons
        waiting_time = lock_acquired_time - lock_waiting_start_time;
 
        pthread_mutex_lock(&m_history_mutex);
-       _I("%s acquires lock after waiting %lluus, %s(%#x) was previously owned in %s",
+       _I("%s acquires lock after waiting %lluus, %s(%#p) was previously owned in %s",
                m_curent_info, waiting_time, expr, this, m_owner_info);
        snprintf(m_owner_info, OWNER_INFO_LEN, "%s", m_curent_info);
        pthread_mutex_unlock(&m_history_mutex);