From: Tomasz Marciniak <t.marciniak@samsung.com>
Date: Wed, 5 Oct 2016 11:42:53 +0000 (+0200)
Subject: [Content] Fix for crash in createThumbnail().
X-Git-Tag: submit/tizen/20161006.015638~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5100832f58eeab3ec280f5795a03a8d646347749;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[Content] Fix for crash in createThumbnail().

[Verification] Code compiles.
Creating thumbnail does not cause crash.
Success callback is called and callback id is correctly retrieved.

Change-Id: I1094730ded85f57bb0088f2f088e50f45d675a95
Signed-off-by: Tomasz Marciniak <t.marciniak@samsung.com>
---

diff --git a/src/content/content_manager.cc b/src/content/content_manager.cc
index bda75067..1f2b0012 100644
--- a/src/content/content_manager.cc
+++ b/src/content/content_manager.cc
@@ -665,6 +665,10 @@ void CreateThumbnailCallback(media_content_error_e err, const char* path, void*
   LoggerD("Enter");
 
   unsigned int* callbackId = (unsigned int*) user_data;
+  if (nullptr == callbackId) {
+    LoggerD("Callback id is null");
+    return;
+  }
 
   if (!(ContentManager::getInstance()->getContentInstance())) {
     // There is not instance already
@@ -1656,7 +1660,7 @@ common::PlatformResult ContentManager::createThumbnail(const picojson::value& ar
                               ("Getting media is failed: %d (%s)", ret, get_error_message(ret)));
   }
 
-  ret = media_info_create_thumbnail(media, CreateThumbnailCallback, /* (void*) callbackId */ nullptr);
+  ret = media_info_create_thumbnail(media, CreateThumbnailCallback, (void*)callbackId);
   media_info_destroy(media);
   if(MEDIA_CONTENT_ERROR_NONE != ret) {
     delete callbackId;
@@ -1664,8 +1668,6 @@ common::PlatformResult ContentManager::createThumbnail(const picojson::value& ar
                               ("Creating thumbnail failed: %d (%s)", ret, get_error_message(ret)));
   }
 
-  delete callbackId;
-
   return PlatformResult(ErrorCode::NO_ERROR);
 }