From bade76fff23a797efabbafb98f3941ea7e04b5ef Mon Sep 17 00:00:00 2001 From: Pawel Andruszkiewicz Date: Fri, 24 Jul 2015 13:55:36 +0200 Subject: [PATCH] [Content] Removed unnecessary memory allocation. Prevent CID: 453854 [Verification] TCT pass rate: 100% Change-Id: Ia036d2b73d7dc48bb2aea752221d20a268bc4f46 Signed-off-by: Pawel Andruszkiewicz --- src/content/content_manager.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/content/content_manager.cc b/src/content/content_manager.cc index 6faddeba..4021a451 100755 --- a/src/content/content_manager.cc +++ b/src/content/content_manager.cc @@ -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); } -- 2.34.1