From a15ae4cf02d8a2b23aa99603305d749034991a79 Mon Sep 17 00:00:00 2001 From: Yu Date: Wed, 12 Feb 2020 13:47:19 +0900 Subject: [PATCH] Fix bugs which are reported by static analyzer Change-Id: Icd3037269b9a412a79f098284fdd2e2112de98e4 Signed-off-by: Yu jiung --- packaging/ug-setting-wifidirect-efl.spec | 2 +- popup-wifidirect/src/wfd-app-client.c | 2 +- ug-wifidirect/include/wfd_ug.h | 6 ++---- ug-wifidirect/src/wfd_client.c | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packaging/ug-setting-wifidirect-efl.spec b/packaging/ug-setting-wifidirect-efl.spec index a3dafa6..53809c0 100644 --- a/packaging/ug-setting-wifidirect-efl.spec +++ b/packaging/ug-setting-wifidirect-efl.spec @@ -1,6 +1,6 @@ Name: ug-setting-wifidirect-efl Summary: Wi-Fi Direct setting UI gadget -Version: 1.11.89 +Version: 1.11.91 Release: 1 Group: Applications/Network License: Flora-1.1 diff --git a/popup-wifidirect/src/wfd-app-client.c b/popup-wifidirect/src/wfd-app-client.c index a9ad6ed..3131594 100644 --- a/popup-wifidirect/src/wfd-app-client.c +++ b/popup-wifidirect/src/wfd-app-client.c @@ -364,7 +364,7 @@ void _cb_connection(int error_code, wifi_direct_connection_state_e connection_st connection = (wfd_connection_info_s*) calloc(1, sizeof(wfd_connection_info_s)); if (!connection) { WFD_APP_LOG(WFD_APP_LOG_ERROR, "Failed to allocate memory for peer"); - free(peer_info); + g_free(peer_info); return; } diff --git a/ug-wifidirect/include/wfd_ug.h b/ug-wifidirect/include/wfd_ug.h index 2d1a31e..ef3dbe6 100644 --- a/ug-wifidirect/include/wfd_ug.h +++ b/ug-wifidirect/include/wfd_ug.h @@ -104,10 +104,8 @@ #define WFD_IF_FREE_MEM(mem) \ do { \ - if (mem) { \ - free(mem); \ - mem = NULL; \ - } \ + g_free(mem); \ + mem = NULL; \ } while (0) #define AP_NAME_LENGTH_MAX 32 diff --git a/ug-wifidirect/src/wfd_client.c b/ug-wifidirect/src/wfd_client.c index 3be0faf..e2d4068 100644 --- a/ug-wifidirect/src/wfd_client.c +++ b/ug-wifidirect/src/wfd_client.c @@ -591,7 +591,7 @@ bool _wfd_discoverd_peer_cb(wifi_direct_discovered_peer_info_s *peer, void *user if (NULL != peer->service_list) { for (i = 0; i < peer->service_count && peer->service_list[i] != NULL; i++) - free(peer->service_list[i]); + g_free(peer->service_list[i]); WFD_IF_FREE_MEM(peer->service_list); } -- 2.7.4