Fix memory allocation in TranslatePrivilegesForCompatibility

Change-Id: I03e8b8a1685ef89389ab51a826e0a6f1958da2ef

diff --git a/src/common/step/step_privilege_compatibility.cc b/src/common/step/step_privilege_compatibility.cc
index 3405e86..bd776e7 100644 (file)
--- a/src/common/step/step_privilege_compatibility.cc
+++ b/src/common/step/step_privilege_compatibility.cc
@@ -31,14 +31,19 @@ bool TranslatePrivilegesForCompatibility(const std::string& pkg_type, manifest_x
   if (pkg_type == "wgt") {
     if (!m->privileges) {
       m->privileges =
-        reinterpret_cast<privileges_x*>(calloc(1, sizeof(privileges_x*)));
+        reinterpret_cast<privileges_x*>(calloc(1, sizeof(privileges_x)));
     }
     privilege_x* priv =
-      reinterpret_cast<privilege_x*>(calloc(1, sizeof(privilege_x*)));
+      reinterpret_cast<privilege_x*>(calloc(1, sizeof(privilege_x)));
     priv->text = strdup(kDefaultPrivilegeForWebApp);
     LISTADD(m->privileges->privilege, priv);
   }
 
+  // No privileges to map
+  if (!m->privileges) {
+    return true;
+  }
+
   // calculate number of privileges
   size_t size = 0;
   privileges_x *privileges = nullptr;

diff --git a/src/wgt/step/step_parse.cc b/src/wgt/step/step_parse.cc
index 02d7a96..a27653d 100755 (executable)
--- a/src/wgt/step/step_parse.cc
+++ b/src/wgt/step/step_parse.cc
@@ -321,8 +321,8 @@ common_installer::Step::Status StepParse::process() {
     }
   }
 
-  const manifest_x* manifest = context_->manifest_data.get();
-  if (!FillManifestX(const_cast<manifest_x*>(manifest))) {
+  manifest_x* manifest = context_->manifest_data.get();
+  if (!FillManifestX(manifest)) {
     LOG(ERROR) << "[Parse] Storing manifest_x failed. "
                <<  parser_->GetErrorMessage();
     return common_installer::Step::Status::ERROR;