From: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
Date: Mon, 24 Aug 2015 09:12:52 +0000 (+0200)
Subject: [Content] Fixed memory leaks.
X-Git-Tag: submit/tizen/20151026.073646^2^2~174^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9388e46f30758ac3eb4858615c18271842604578;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[Content] Fixed memory leaks.

Prevent CIDs: 435866, 435892, 435893, 435906, 435939

[Verification] TCT pass rate (r35): 100% (230/230/0/0/0)

Change-Id: I381fb39f0388dd3a3eca3710fdffe8dccdb6eaf9
Signed-off-by: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
---

diff --git a/src/content/content_manager.cc b/src/content/content_manager.cc
index 60fcafd0..e11670b2 100755
--- a/src/content/content_manager.cc
+++ b/src/content/content_manager.cc
@@ -977,6 +977,7 @@ int ContentManager::updateBatch(picojson::value args) {
     if (media != NULL && ret == MEDIA_CONTENT_ERROR_NONE) {
       setContent(media, content);
       ret = media_info_update_to_db(media);
+      media_info_destroy(media);
     } else {
       return ret;
     }
@@ -1073,6 +1074,12 @@ void ContentManager::playlistGet(const std::shared_ptr<ReplyCallbackData>& user_
   media_content_order_e order = MEDIA_CONTENT_ORDER_ASC;
   const std::string playOrder("play_order");
 
+  SCOPE_EXIT {
+    if (playlist) {
+      media_playlist_destroy(playlist);
+    }
+  };
+
   std::string playlist_id = user_data->args.get("playlistId").get<std::string>();
   int ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
   if(ret != MEDIA_CONTENT_ERROR_NONE && playlist == NULL) {
@@ -1122,6 +1129,12 @@ void ContentManager::playlistRemovebatch(const std::shared_ptr<ReplyCallbackData
   LoggerD("Enter");
   media_playlist_h playlist = NULL;
 
+  SCOPE_EXIT {
+    if (playlist) {
+      media_playlist_destroy(playlist);
+    }
+  };
+
   std::string playlist_id = user_data->args.get("playlistId").get<std::string>();
   int ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
   if(ret != MEDIA_CONTENT_ERROR_NONE && playlist == NULL) {
@@ -1154,6 +1167,12 @@ void ContentManager::playlistSetOrder(const std::shared_ptr<ReplyCallbackData>&
   LoggerD("Enter");
   media_playlist_h playlist = NULL;
 
+  SCOPE_EXIT {
+    if (playlist) {
+      media_playlist_destroy(playlist);
+    }
+  };
+
   std::string playlist_id = user_data->args.get("playlistId").get<std::string>();
   int ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
   if(ret != MEDIA_CONTENT_ERROR_NONE && playlist == NULL) {
@@ -1200,6 +1219,13 @@ void ContentManager::playlistSetOrder(const std::shared_ptr<ReplyCallbackData>&
 void ContentManager::playlistMove(const std::shared_ptr<ReplyCallbackData>& user_data) {
   LoggerD("Enter");
   media_playlist_h playlist = NULL;
+
+  SCOPE_EXIT {
+    if (playlist) {
+      media_playlist_destroy(playlist);
+    }
+  };
+
   std::string playlist_id = user_data->args.get("playlistId").get<std::string>();
   int ret = media_playlist_get_playlist_from_db(std::stoi(playlist_id), &playlist);
   if(ret != MEDIA_CONTENT_ERROR_NONE && playlist == NULL) {