Fix static analysis issue

Change-Id: Ie6ba232de7ca2c95f1ad81858db33479ad13a5b1
Signed-off-by: Junghoon Park <jh9216.park@samsung.com>

diff --git a/watchface-common/db-manager.cc b/watchface-common/db-manager.cc
index 9941370..fb0af2b 100644 (file)
--- a/watchface-common/db-manager.cc
+++ b/watchface-common/db-manager.cc
@@ -567,8 +567,14 @@ DBManager::GetProviderList(std::string& app_id) {
 
   std::list<std::shared_ptr<DBManager::ProviderInfo>> provider_list;
   while (db.Step() == SQLITE_ROW) {
-    std::string provider_id = db.GetText(0);
-    std::string app_id = db.GetText(1);
+    const char* provider_id_raw = db.GetText(0);
+    const char* app_id_raw = db.GetText(1);
+    std::string provider_id;
+    std::string app_id;
+    if (provider_id_raw != nullptr)
+      provider_id = provider_id_raw;
+    if (app_id_raw != nullptr)
+      app_id = app_id_raw;
     int support_types = db.GetInt(2);
     std::string icon = GetIcon(provider_id, locale);
     std::string label = GetLabel(provider_id.c_str());