Fix svace issues

diff --git a/cts-verifier/cts-verifier-main.c b/cts-verifier/cts-verifier-main.c
index 6ac849f..72b8711 100644 (file)
--- a/cts-verifier/cts-verifier-main.c
+++ b/cts-verifier/cts-verifier-main.c
@@ -200,7 +200,7 @@ static gboolean __test_terminal_read_std_input(GIOChannel * source,
                exit(1);
        } else if (buf[0] == '\n' || buf[0] == '\r') {
                __usage_full();
-       } else if (n - 1 > 0 && n < 1024) {
+       } else if (n < 1024 && n - 1 > 0) {
                buf[n - 1] = '\0'; /* remove new line... */
                printf("\n\n");
                __process_input(buf, user_data);

diff --git a/test/wifi-aware-publish-test.c b/test/wifi-aware-publish-test.c
index 41a150d..8b3a43f 100644 (file)
--- a/test/wifi-aware-publish-test.c
+++ b/test/wifi-aware-publish-test.c
@@ -405,6 +405,8 @@ static void __message_received_cb(wifi_aware_session_h session, wifi_aware_peer_
        ret = wifi_aware_peer_get_mac(peer, &mac);
        if (ret != WIFI_AWARE_ERROR_NONE) {
                printf("\tPeer's NMI: Failure(%d:%s)\n", ret, __print_error(ret));
+               if (mac)
+                       g_free(mac);
                __test_finish(0);
                return;
        } else {

diff --git a/test/wifi-aware-subscribe-test.c b/test/wifi-aware-subscribe-test.c
index f9f0c75..dea48be 100644 (file)
--- a/test/wifi-aware-subscribe-test.c
+++ b/test/wifi-aware-subscribe-test.c
@@ -422,11 +422,13 @@ static void __message_received_cb(wifi_aware_session_h session, wifi_aware_peer_
                printf("\tPeer's NMI: ");
                if (mac != NULL) {
                        __print_mac(mac);
-                       g_free(mac);
                }
                printf("\n");
        }
 
+       if (mac)
+               g_free(mac);
+
        memcpy(buf, message, 1024);
        buf[len] = '\0';
        printf("\tMessage: %s\n", buf);
@@ -452,6 +454,8 @@ static void __service_discovered_cb(wifi_aware_session_h session,
        ret = wifi_aware_peer_get_mac(peer, &mac);
        if (ret != WIFI_AWARE_ERROR_NONE) {
                printf("\tPeer's NMI: Failure(%d:%s)\n", ret, __print_error(ret));
+               if (mac)
+                       g_free(mac);
                __test_finish(0);
                return;
        } else {