[Content] Removed unnecessary memory allocation.
authorPawel Andruszkiewicz <p.andruszkie@samsung.com>
Fri, 24 Jul 2015 11:55:36 +0000 (13:55 +0200)
committerPawel Andruszkiewicz <p.andruszkie@samsung.com>
Fri, 24 Jul 2015 11:55:36 +0000 (13:55 +0200)
Prevent CID: 453854

[Verification] TCT pass rate: 100%

Change-Id: Ia036d2b73d7dc48bb2aea752221d20a268bc4f46
Signed-off-by: Pawel Andruszkiewicz <p.andruszkie@samsung.com>
src/content/content_manager.cc

index 6faddebafc0661262d15503366ffbeb46dc8acce..4021a4511d0763053b0d0f6b470591caacbdebce 100755 (executable)
@@ -1329,16 +1329,15 @@ int ContentManager::getLyrics(const picojson::value& args, picojson::object& res
     result["timestamps"] = picojson::value(timestamps);
     ret = METADATA_EXTRACTOR_ERROR_NONE;
   } else {
-    char* unSyncText;
-    ret = metadata_extractor_get_metadata(extractor,
-        METADATA_UNSYNCLYRICS, &unSyncText);
+    char* unSyncText = nullptr;
+    ret = metadata_extractor_get_metadata(extractor, METADATA_UNSYNCLYRICS,
+                                          &unSyncText);
     if (ret == METADATA_EXTRACTOR_ERROR_NONE) {
       result["type"] = picojson::value(std::string("UNSYNCHRONIZED"));
-      if (unSyncText == NULL) {
+      if (nullptr == unSyncText) {
         LOGGER(ERROR) << "Unsynchronized lyrics text is NULL";
-        unSyncText = strdup(""); // prevents picojson assert
       }
-      texts.push_back(picojson::value(std::string(unSyncText)));
+      texts.push_back(picojson::value(unSyncText ? unSyncText : ""));
       result["texts"] = picojson::value(texts);
       free(unSyncText);
     }