bootstrap: fix svace/coverity issues for some commands

Change-Id: I591d160243446ae0eec9d571b3630734543a6338

diff --git a/bootstrap/server/src/Commands/GetAppInfoCommand.cc b/bootstrap/server/src/Commands/GetAppInfoCommand.cc
index 7b673ad..961fd82 100644 (file)
--- a/bootstrap/server/src/Commands/GetAppInfoCommand.cc
+++ b/bootstrap/server/src/Commands/GetAppInfoCommand.cc
@@ -29,31 +29,22 @@ GetAppInfoCommand::GetAppInfoCommand(const ::aurum::ReqGetAppInfo* request,
     mResponse->set_isrunning(false);
     mResponse->set_isfocused(false);
 
-
-    ret = package_manager_get_package_info(packageName.c_str(), &package_info);
-    if (!ret) {
-        package_info_get_label(package_info, &label);
-        if (label) {
-            free(label);
-            mResponse->set_isinstalled(true);
-        } else {
-            return grpc::Status::OK;
+    if (!package_manager_get_package_info(packageName.c_str(), &package_info)) {
+        if (!package_info_get_label(package_info, &label)) {
+            if (label) {
+                free(label);
+                mResponse->set_isinstalled(true);
+            }
         }
-    } else {
-        return grpc::Status::OK;
     }
 
-    ret = app_manager_get_app_context(packageName.c_str(), &app_context);
-    if (!ret) {
-        mResponse->set_isrunning(!(appState & APP_STATE_TERMINATED));
-    } else {
-        return grpc::Status::OK;
+    if (!app_manager_get_app_context(packageName.c_str(), &app_context)) {
+        if (!app_context_get_app_state(app_context, &appState)) {
+            mResponse->set_isfocused(appState & APP_STATE_FOREGROUND);
+            mResponse->set_isrunning(!(appState & APP_STATE_TERMINATED));
+        }
     }
 
-    ret = app_context_get_app_state(app_context, &appState);
-    if (!ret) {
-        mResponse->set_isfocused(appState & APP_STATE_FOREGROUND);
-    }
 #endif
     return grpc::Status::OK;
 }

diff --git a/bootstrap/server/src/Commands/GetSizeCommand.cc b/bootstrap/server/src/Commands/GetSizeCommand.cc
index 88d896f..de77d0e 100644 (file)
--- a/bootstrap/server/src/Commands/GetSizeCommand.cc
+++ b/bootstrap/server/src/Commands/GetSizeCommand.cc
@@ -14,16 +14,15 @@ GetSizeCommand::GetSizeCommand(const ::aurum::ReqGetSize* request,
     LOG_SCOPE_F(INFO, "GetSize --------------- ");
     ObjectMapper *mObjMap = ObjectMapper::getInstance();
     UiObject* obj = mObjMap->getElement(mRequest->elementid());
-
-    const Rect<int> &size = obj->getBoundingBox();
-
-    ::aurum::Rect rect;
-    rect.set_x(size.mTopLeft.x);
-    rect.set_y(size.mTopLeft.y);
-    rect.set_width(size.width());
-    rect.set_height(size.height());
-
-    mResponse->mutable_size()->CopyFrom(rect);
+    if (obj) {
+        const Rect<int> &size = obj->getBoundingBox();
+        ::aurum::Rect rect;
+        rect.set_x(size.mTopLeft.x);
+        rect.set_y(size.mTopLeft.y);
+        rect.set_width(size.width());
+        rect.set_height(size.height());
+        mResponse->mutable_size()->CopyFrom(rect);
+    }
 
     return grpc::Status::OK;
 }
\ No newline at end of file

diff --git a/libaurum/src/AccessibleNode.cc b/libaurum/src/AccessibleNode.cc
index d60df30..6f25089 100644 (file)
--- a/libaurum/src/AccessibleNode.cc
+++ b/libaurum/src/AccessibleNode.cc
@@ -20,7 +20,7 @@ AccessibleNode::AccessibleNode() : AccessibleNode(nullptr)
 }
 
 AccessibleNode::AccessibleNode(AtspiAccessible *node)
-    : mNode(node), mSupportingIfaces(0), mFeatureProperty(0), mIsAlive(true)
+    : mNode(node), mBoundingBox{0,0,0,0}, mSupportingIfaces(0), mFeatureProperty(0), mIsAlive(true)
 {
     // prohibited to create this object this constructor
     // better to use AccessibleNode::get factory method.
@@ -303,4 +303,4 @@ void AccessibleNode::setValue(std::string &text) const
         atspi_editable_text_insert_text(iface, 0, text.c_str(), text.length(),
                                         NULL);
     }
-}
\ No newline at end of file
+}