Fix static analysis issues

Change-Id: I8f36e774e16474f6333b8d933e1d1b00ae41a696

diff --git a/src/common/mdg_manager.cc b/src/common/mdg_manager.cc
index 8e468a15e3e1c3a1c4360bb6e9fbe828a08a9047..114e53b857f1affc5cfeab0af42aad830dbf082a 100644 (file)
--- a/src/common/mdg_manager.cc
+++ b/src/common/mdg_manager.cc
@@ -70,7 +70,7 @@ void SendDataFinishCb(int result, mdg_device_h device, char* channel_id,
   // return to dbus method caller
   capmgr::DBusService::SendAppControlReply(msg_id, data, len);
 }
-
+/*
 void SendFileProgressCb(const char* file_path_, long long int send_size,  // NOLINT
     long long int total_size, int percent, void* user_data) {  // NOLINT
   std::string file_path = std::string(file_path_);
@@ -92,7 +92,7 @@ void SendFileFinishCb(int result, mdg_device_h device,
 
   capmgr::DBusService::SendFileResult(file_path, result);
 }
-
+*/
 std::string GetDeviceIdFromHandle(const mdg_device_h device) {
   char* val;
   int ret = mdg_device_info_get_device_id(device, &val);
@@ -254,13 +254,17 @@ void MDGManager::ReceiveDataCb(int result, char* device_id, char* channel_id,
 
   // FIXME(jeremy.jang): temporary code. need to send proper reply packet.
   unsigned char* reply = new unsigned char[4];
+  if (!reply) {
+    LOG(ERROR) << "Out of memory";
+    return;
+  }
   size_t reply_len = 4;
   memset(reply, 0, reply_len);
   int ret = mdg_device_send_response(mdgmgr->mdg_handle_, device_id,
       channel_id, msg_id, reply, reply_len);
   if (ret != MDG_ERROR_NONE)
     LOG(ERROR) << "Failed to send response to " << device_id;
-  delete reply;
+  delete[] reply;
 }
 
 bool MDGManager::GroupFoundCb(mdg_group_type_e type, mdg_group_h group,
@@ -337,7 +341,7 @@ bool MDGManager::GroupForeachCb(mdg_device_h device, void* user_data) {
   memcpy(packages_data, packages.c_str(), packages.size());
   mdgmgr->SendData(device_id, Command::ADD_PACKAGEINFO, packages_data,
       packages.size());
-  delete packages_data;
+  delete[] packages_data;
 
   return true;
 }
@@ -405,7 +409,7 @@ void MDGManager::HandlePackageEvent(const std::string& pkgid,
     packed = this->pm_->PackPackages(packages);
     package_data = new unsigned char[packed.size()];
     memcpy(package_data, packed.c_str(), packed.size());
-    delete info;
+    delete[] info;
   } else if (event_type == PackageEventListener::EventType::UNINSTALL) {
     package_data = new unsigned char[pkgid.size()];
     memcpy(package_data, pkgid.c_str(), pkgid.size());
@@ -419,7 +423,7 @@ void MDGManager::HandlePackageEvent(const std::string& pkgid,
     packed = info->Serialize();
     package_data = new unsigned char[packed.size()];
     memcpy(package_data, packed.c_str(), packed.size());
-    delete info;
+    delete[] info;
   }
 
   std::vector<RemoteDevice> dev_list = DBManager::SelectDevices();
@@ -443,7 +447,7 @@ void MDGManager::HandlePackageEvent(const std::string& pkgid,
     }
   }
 
-  delete package_data;
+  delete[] package_data;
 }
 
 bool MDGManager::AddDevice(const mdg_device_h device) {
@@ -575,13 +579,14 @@ bool MDGManager::SendReplyData(const std::string& device_id, Command cmd,
   if (ret != MDG_ERROR_NONE)
     LOG(ERROR) << "Failed to send response to " << device_id;
 
-  delete buf;
+  delete[] buf;
 
   return true;
 }
 
 int MDGManager::SendFile(const std::string& device_id,
     const std::string& file_path) {
+/*
   LOG(INFO) << "SendFile to " << device_id;
   LOG(INFO) << "File: " << file_path;
 
@@ -598,7 +603,7 @@ int MDGManager::SendFile(const std::string& device_id,
 
   if (ret != MDG_ERROR_NONE)
     LOG(ERROR) << "Failed to send file: " << MDGErrorToString(ret);
-
+*/
   return 0;
 }
 
@@ -634,7 +639,7 @@ void MDGManager::ExchangeCapabilities() {
     SendData(device_id, Command::EXCHANGE_CAPS, caps_data, caps.size());
     free(device_id);
   }
-  delete caps_data;
+  delete[] caps_data;
 }
 
 int MDGManager::SendAppControl(const std::string& device_id,

diff --git a/src/unit_tests/dbus_service_test.cc b/src/unit_tests/dbus_service_test.cc
index 83de98805c9a40a777f8632ca683458755cb5118..7c8875a548681f4bce76a0886148681096e876d5 100644 (file)
--- a/src/unit_tests/dbus_service_test.cc
+++ b/src/unit_tests/dbus_service_test.cc
@@ -114,14 +114,14 @@ void __gvar_arr_to_cstr(GVariantIter* gvar_iter, guint len, char** str) {
 TEST_F(DBusServiceTest, SendAppControlTest) {\r
   DBusService service = DBusService();\r
   char *val;\r
-  std::string* dev_id;\r
+  std::string dev_id;\r
 \r
   service.RegisterSendAppcontrolHandler("SendRemoteAppControl",\r
       [&val, &dev_id](const std::string& device_id, const unsigned char* data,\r
       size_t len) {\r
     bundle* b;\r
     char *b_val;\r
-    dev_id = new std::string(device_id);\r
+    dev_id = std::string(device_id);\r
     b = bundle_decode(data, len);\r
     bundle_get_str(b, "test", &b_val);\r
     val = strdup(b_val);\r
@@ -142,7 +142,7 @@ TEST_F(DBusServiceTest, SendAppControlTest) {
   PushMethodHandler("SendRemoteAppControl", appcontrol_var);\r
   g_variant_unref(appcontrol_var);\r
 \r
-  ASSERT_THAT(*dev_id, testing::StrEq("testdevice"));\r
+  ASSERT_THAT(dev_id, testing::StrEq("testdevice"));\r
   ASSERT_THAT(val, testing::StrEq("1234"));\r
 \r
   const char* test_str = "test-string-1234";\r
@@ -162,7 +162,6 @@ TEST_F(DBusServiceTest, SendAppControlTest) {
   ASSERT_EQ(g_strcmp0(reply_str, test_str), 0);\r
   g_free(reply_str);\r
   free(val);\r
-  delete dev_id;\r
 }\r
 \r
 int __fake_creds_gdbus_get_client(GDBusConnection* conn,\r