Fix static analysis issues

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

diff --git a/unit_tests/src/rpc_port_parcel_test.cc b/unit_tests/src/rpc_port_parcel_test.cc
index a04d6a1..2b67502 100644 (file)
--- a/unit_tests/src/rpc_port_parcel_test.cc
+++ b/unit_tests/src/rpc_port_parcel_test.cc
@@ -259,8 +259,8 @@ TEST_F(ParcelTest, rpc_port_parcel_read_write_bundle_P) {
 
   b = nullptr;
   ret = rpc_port_parcel_read_bundle(handle_, &b);
-  ASSERT_EQ(ret, 0);
   bp = std::unique_ptr<bundle, decltype(bundle_free)*>(b, bundle_free);
+  ASSERT_EQ(ret, 0);
 
   char* str;
   ret = bundle_get_str(bp.get(), "Test", &str);

diff --git a/unit_tests/src/rpc_port_test.cc b/unit_tests/src/rpc_port_test.cc
index 601f4c4..666dfed 100644 (file)
--- a/unit_tests/src/rpc_port_test.cc
+++ b/unit_tests/src/rpc_port_test.cc
@@ -105,10 +105,11 @@ class RpcPortConnection : public RpcPortBase {
            rpc_port_h port, void *data) -> int {
           RpcPortConnection* p = static_cast<RpcPortConnection*>(data);
           p->stub_port_ = port;
-          rpc_port_stub_get_port(p->stub_handle_, RPC_PORT_PORT_CALLBACK,
+          int ret = rpc_port_stub_get_port(p->stub_handle_, RPC_PORT_PORT_CALLBACK,
               instance, &p->stub_callback_port_);
-
           p->Finish();
+          if (ret != 0)
+            return -1;
           return 0;
         }, this);
     ASSERT_EQ(ret, 0);