Svace: fix memory leaks

Change-Id: Icf9a78dd6d727f9181fac1003882f853345f39e3

diff --git a/tests/unittest/wifi-aware-peer-unittest.cpp b/tests/unittest/wifi-aware-peer-unittest.cpp
index a23687d..20cede9 100644 (file)
--- a/tests/unittest/wifi-aware-peer-unittest.cpp
+++ b/tests/unittest/wifi-aware-peer-unittest.cpp
@@ -45,6 +45,7 @@ TEST_F(WifiAwarePeer, wifi_aware_peer_get_mac_p)
        unsigned char *mac;
 
        ret = wifi_aware_peer_get_mac(g_peer, &mac);
-       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_peer_get_mac");
        free(mac);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_peer_get_mac");
 }

diff --git a/tests/unittest/wifi-aware-session-unittest.cpp b/tests/unittest/wifi-aware-session-unittest.cpp
index f66f397..fc30ad5 100644 (file)
--- a/tests/unittest/wifi-aware-session-unittest.cpp
+++ b/tests/unittest/wifi-aware-session-unittest.cpp
@@ -155,9 +155,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_unset_terminated_cb_p)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_PUBLISH, 1);
 
        ret = wifi_aware_session_unset_terminated_cb(session);
-       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_unset_terminated_cb");
-
        __destroy_dummy_session(session);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_unset_terminated_cb");
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_unset_terminated_cb_n)
@@ -504,10 +504,10 @@ TEST_F(WifiAwareSession, wifi_aware_session_stop_p1)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_PUBLISH, 1);
 
        ret = wifi_aware_session_stop(session);
-       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_stop");
-
        __destroy_dummy_session(session);
        __destroy_dummy_publish_config(config);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_stop");
 }
 
 TEST_F(WifiAwareSession, wifi_aware_session_stop_p2)
@@ -517,10 +517,10 @@ TEST_F(WifiAwareSession, wifi_aware_session_stop_p2)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_SUBSCRIBE, 1);
 
        ret = wifi_aware_session_stop(session);
-       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_stop");
-
        __destroy_dummy_session(session);
        __destroy_dummy_subscribe_config(config);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_stop");
 }
 
 /**
@@ -532,9 +532,9 @@ TEST_F(WifiAwareSession, wifi_aware_session_stop_n1)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_PUBLISH, 0);
 
        ret = wifi_aware_session_stop(session);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_stop");
-
        __destroy_dummy_session(session);
+
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_stop");
 }
 
 /**
@@ -546,9 +546,8 @@ TEST_F(WifiAwareSession, wifi_aware_session_stop_n2)
        wifi_aware_session_h session = __create_dummy_session(WIFI_AWARE_SESSION_PUBLISH, 0);
 
        ret = wifi_aware_session_stop(session);
-       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_stop");
-
        __destroy_dummy_session(session);
+       CHECK_RESULT(WIFI_AWARE_ERROR_INVALID_OPERATION, ret, "wifi_aware_session_stop");
 }
 
 /**
@@ -662,7 +661,12 @@ TEST_F(WifiAwareSession, wifi_aware_session_send_message_p)
        wifi_aware_peer_h peer = __create_dummy_peer();
 
        ret = wifi_aware_session_send_message(session, peer, message, strlen(MESSAGE), __send_reply, NULL);
-       CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_send_message");
+       if (ret != WIFI_AWARE_ERROR_NONE) {
+               __destroy_dummy_peer(peer);
+               __destroy_dummy_session(session);
+               CHECK_RESULT(WIFI_AWARE_ERROR_NONE, ret, "wifi_aware_session_send_message");
+       }
+
        RUN_GMAIN_LOOP;
 
        ASSERT_TRUE(g_message_sent) << "Followup message";

diff --git a/tests/unittest/wifi-aware-unittest-util.cpp b/tests/unittest/wifi-aware-unittest-util.cpp
index 2db16e4..b7342fb 100644 (file)
--- a/tests/unittest/wifi-aware-unittest-util.cpp
+++ b/tests/unittest/wifi-aware-unittest-util.cpp
@@ -145,6 +145,10 @@ wifi_aware_publish_h __create_dummy_publish_config()
 {
        __wifi_aware_publish_request_s *config =
                (__wifi_aware_publish_request_s *)g_try_malloc0(sizeof(__wifi_aware_publish_request_s));
+
+       if (config == NULL)
+               return NULL;
+
        config->publish_type = WIFI_AWARE_PUBLISH_TYPE_UNSOLICITED;
        strncpy(config->service_name, SERVICE_NAME, MAX_SERVICE_NAME_LEN + 1);
        memcpy(config->specific_info, SERVICE_INFO, strlen(SERVICE_INFO));
@@ -163,6 +167,10 @@ wifi_aware_subscribe_h __create_dummy_subscribe_config()
 {
        __wifi_aware_subscribe_request_s *config =
                (__wifi_aware_subscribe_request_s *)g_try_malloc0(sizeof(__wifi_aware_subscribe_request_s));
+
+       if (config == NULL)
+               return NULL;
+
        config->subscribe_type = WIFI_AWARE_SUBSCRIBE_TYPE_PASSIVE;
        strncpy(config->service_name, SERVICE_NAME, MAX_SERVICE_NAME_LEN + 1);
        memcpy(config->specific_info, SERVICE_INFO, strlen(SERVICE_INFO));