From 836f725470fdcd07f73980bb5b2809bd3e9558cc Mon Sep 17 00:00:00 2001
From: "mk5004.lee" <mk5004.lee@samsung.com>
Date: Fri, 30 Aug 2019 12:33:06 +0900
Subject: [PATCH] Fix resouce leak

Change-Id: Ie5385a92f0a8f5ce61e3c43648e3069ba686d805
Signed-off-by: mk5004.lee <mk5004.lee@samsung.com>
---
 notification-ex/app_control_action.cc      | 1 +
 notification-ex/dbus_connection_manager.cc | 5 ++++-
 notification-ex/default_action_factory.cc  | 7 +++++--
 notification-ex/group_item.cc              | 1 +
 unittest/src/test_group_item.cc            | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/notification-ex/app_control_action.cc b/notification-ex/app_control_action.cc
index 73b1cd5..9c6f552 100644
--- a/notification-ex/app_control_action.cc
+++ b/notification-ex/app_control_action.cc
@@ -79,6 +79,7 @@ Bundle AppControlAction::Serialize() const {
   bundle_encode(control_b, &control_raw, &len);
   if (len <= 0) {
     LOGE("bundle encode failed");
+    bundle_free(control_b);
     return {};
   }
 
diff --git a/notification-ex/dbus_connection_manager.cc b/notification-ex/dbus_connection_manager.cc
index 6b81f6a..633fa41 100644
--- a/notification-ex/dbus_connection_manager.cc
+++ b/notification-ex/dbus_connection_manager.cc
@@ -82,7 +82,10 @@ std::string DBusConnectionManager::GetBusName(string appid) const {
   if (encoded_str == NULL)
     return "";
 
-  return string(NOTIFICATION_EX_BUS_NAME_PREFIX) + encoded_str;
+  string bus_name = string(NOTIFICATION_EX_BUS_NAME_PREFIX) + encoded_str;
+  g_free(encoded_str);
+
+  return bus_name;
 }
 
 int DBusConnectionManager::Init() {
diff --git a/notification-ex/default_action_factory.cc b/notification-ex/default_action_factory.cc
index fde65ee..fd56f99 100644
--- a/notification-ex/default_action_factory.cc
+++ b/notification-ex/default_action_factory.cc
@@ -37,10 +37,13 @@ unique_ptr<AbstractAction> DefaultActionFactory::CreateAction(int type) {
   switch (type) {
     case AbstractAction::NullObject :
       THROW(ERROR_INVALID_PARAMETER);
-    case AbstractAction::AppControl :
+    case AbstractAction::AppControl : {
       app_control_h control;
       app_control_create(&control);
-      return unique_ptr<AbstractAction>(new AppControlAction(control));
+      unique_ptr<AbstractAction> action(new AppControlAction(control));
+      app_control_destroy(control);
+      return action;
+    }
     case AbstractAction::Visibility :
       return unique_ptr<AbstractAction>(new VisibilityAction());
     case AbstractAction::Custom :
diff --git a/notification-ex/group_item.cc b/notification-ex/group_item.cc
index a1bda0e..f03cc88 100644
--- a/notification-ex/group_item.cc
+++ b/notification-ex/group_item.cc
@@ -187,6 +187,7 @@ string GroupItem::GetAppLabel() {
     if (ret != APP_ERROR_NONE)
       THROW(ERROR_IO_ERROR);
     impl_->app_label_ = string(name);
+    free(name);
   }
   return impl_->app_label_;
 }
diff --git a/unittest/src/test_group_item.cc b/unittest/src/test_group_item.cc
index 6034c37..caa46b0 100644
--- a/unittest/src/test_group_item.cc
+++ b/unittest/src/test_group_item.cc
@@ -133,7 +133,7 @@ TEST_F(GroupItemTest, FindByIDNullItemReturn) {
 }
 
 int __fake_app_get_name(char** app_name) {
-  *app_name = (char*)"unittest_appname";
+  *app_name = strdup("unittest_appname");
   return 0;
 }
 
-- 
2.7.4