Check the parsed theme is valid or not

Change-Id: I03b047f7abd1bd5fcf452bd6c106feb6f70faaa5
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/src/theme_plugin/theme_metadata_plugin.cc b/src/theme_plugin/theme_metadata_plugin.cc
index eadf073..d004781 100644 (file)
--- a/src/theme_plugin/theme_metadata_plugin.cc
+++ b/src/theme_plugin/theme_metadata_plugin.cc
@@ -51,8 +51,12 @@ bool InstallTheme(const std::string& id, const std::string& pkgid,
     return false;
   }
   ttm::plugin::ThemeParser parser(path);
-  if (!parser.Commit(ttm::plugin::ThemeParser::ThemeOperation::ADD,
-      parser.Inflate(id, pkgid, uid)))
+  ttm::loader::ThemeInfo theme = parser.Inflate(id, pkgid, uid);
+  if (!theme.IsValid()) {
+    LOG(ERROR) << "Failed to parse theme";
+    return false;
+  }
+  if (!parser.Commit(ttm::plugin::ThemeParser::ThemeOperation::ADD, theme))
     return false;
   return true;
 }
@@ -81,8 +85,12 @@ bool UpgradeTheme(const std::string& id, const std::string& pkgid,
     return false;
   }
   ttm::plugin::ThemeParser parser(path);
-  if (!parser.Commit(ttm::plugin::ThemeParser::ThemeOperation::UPDATE,
-      parser.Inflate(id, pkgid, uid)))
+    ttm::loader::ThemeInfo theme = parser.Inflate(id, pkgid, uid);
+  if (!theme.IsValid()) {
+    LOG(ERROR) << "Failed to parse theme";
+    return false;
+  }
+  if (!parser.Commit(ttm::plugin::ThemeParser::ThemeOperation::UPDATE, theme))
     return false;
   return true;
 }
@@ -111,8 +119,12 @@ bool UninstallTheme(const std::string& id, const std::string& pkgid,
     return false;
   }
   ttm::plugin::ThemeParser parser(path);
-  if (!parser.Commit(ttm::plugin::ThemeParser::ThemeOperation::REMOVE,
-      parser.Inflate(id, pkgid, uid)))
+  ttm::loader::ThemeInfo theme = parser.Inflate(id, pkgid, uid);
+  if (!theme.IsValid()) {
+    LOG(ERROR) << "Failed to parse theme";
+    return false;
+  }
+  if (!parser.Commit(ttm::plugin::ThemeParser::ThemeOperation::REMOVE, theme))
     return false;
   return true;
 }