Fix the external sensor worker to handle NULL payload properly

Change-Id: If425d87b5cae885ee972fdb16edd9b30c9987182
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/src/server/external_sensor_worker.cpp b/src/server/external_sensor_worker.cpp
index 9bc46fb..67bb4d7 100644 (file)
--- a/src/server/external_sensor_worker.cpp
+++ b/src/server/external_sensor_worker.cpp
@@ -79,25 +79,22 @@ bool external_sensor_worker::working(void *ctx)
                return false;
        }
 
-       if (header.size > 0) {
-               payload = new(std::nothrow) char[header.size];
-               retvm_if(!payload, false, "Failed to allocate memory");
-
-               if (inst->m_socket.recv(payload, header.size) <= 0) {
-                       string info;
-                       inst->get_info(info);
-                       _D("%s failed to receive data of packet", info.c_str());
-                       delete[] payload;
-                       return false;
-               }
-       } else {
-               payload = NULL;
+       retvm_if(header.size == 0, false, "Invalid header size");
+
+       payload = new(std::nothrow) char[header.size];
+       retvm_if(!payload, false, "Failed to allocate memory");
+
+       if (inst->m_socket.recv(payload, header.size) <= 0) {
+               string info;
+               inst->get_info(info);
+               _D("%s failed to receive data of packet", info.c_str());
+               delete[] payload;
+               return false;
        }
 
        ret = inst->dispatch_command(header.cmd, payload);
 
-       if (payload)
-               delete[] payload;
+       delete[] payload;
 
        return ret;
 }