From 6b509302d9c9c8d78260550e67947bc4b1d4a413 Mon Sep 17 00:00:00 2001 From: "hyunuk.tak" Date: Wed, 2 Dec 2020 14:04:53 +0900 Subject: [PATCH] Fix some svaces MEMORY_LEAK.EX UNINIT.LOCAL_VAR.EX DEREF_OF_NULL.RET.ALLOC Change-Id: I1b3910c0dfc9e8752e3f781dab6aab8eb965f781 Signed-off-by: hyunuk.tak --- haltests/net-config-haltests.cpp | 1 + src/vpnsvc.c | 24 ++++++++++++++---------- src/wifi-key-encryption.c | 16 +++++++++------- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/haltests/net-config-haltests.cpp b/haltests/net-config-haltests.cpp index 9f816a0..6538244 100755 --- a/haltests/net-config-haltests.cpp +++ b/haltests/net-config-haltests.cpp @@ -138,6 +138,7 @@ static bool __found_ap_callback(wifi_manager_ap_h ap, void *user_data) } } + g_free(ap_name); return true; } diff --git a/src/vpnsvc.c b/src/vpnsvc.c index 922502a..e831819 100755 --- a/src/vpnsvc.c +++ b/src/vpnsvc.c @@ -205,11 +205,13 @@ gboolean handle_vpn_block_networks(Vpnsvc *object, } int tmp_route_len = strlen(route_dest); nets_vpn[i] = g_try_malloc0(sizeof(char) * tmp_route_len + 1); - strncpy(nets_vpn[i], route_dest, tmp_route_len); - nets_vpn[i][tmp_route_len] = '\0'; - prefix_vpn[i] = route_prefix; - DBG("nets_vpn[%d] = %s \t", i, (nets_vpn[i] == NULL) ? "" : nets_vpn[i]); - DBG("prefix_vpn[%d] = %d ", i, prefix_vpn[i]); + if (nets_vpn[i]) { + strncpy(nets_vpn[i], route_dest, tmp_route_len); + nets_vpn[i][tmp_route_len] = '\0'; + prefix_vpn[i] = route_prefix; + DBG("nets_vpn[%d] = %s \t", i, (nets_vpn[i] == NULL) ? "" : nets_vpn[i]); + DBG("prefix_vpn[%d] = %d ", i, prefix_vpn[i]); + } i++; } } @@ -230,11 +232,13 @@ gboolean handle_vpn_block_networks(Vpnsvc *object, } int tmp_route_len = strlen(route_dest); nets_orig[i] = g_try_malloc0(sizeof(char) * tmp_route_len + 1); - strncpy(nets_orig[i], route_dest, tmp_route_len); - nets_orig[i][tmp_route_len] = '\0'; - prefix_orig[i] = route_prefix; - DBG("nets_orig[%d] = %s \t", i, (nets_orig[i] == NULL) ? "" : nets_orig[i]); - DBG("prefix_orig[%d] = %d ", i, prefix_orig[i]); + if (nets_orig[i]) { + strncpy(nets_orig[i], route_dest, tmp_route_len); + nets_orig[i][tmp_route_len] = '\0'; + prefix_orig[i] = route_prefix; + DBG("nets_orig[%d] = %s \t", i, (nets_orig[i] == NULL) ? "" : nets_orig[i]); + DBG("prefix_orig[%d] = %d ", i, prefix_orig[i]); + } i++; } } diff --git a/src/wifi-key-encryption.c b/src/wifi-key-encryption.c index 8797213..a34ac97 100755 --- a/src/wifi-key-encryption.c +++ b/src/wifi-key-encryption.c @@ -158,9 +158,9 @@ gchar* _netconfig_encrypt_passphrase(const gchar *passphrase) gchar* origin_value = NULL; gchar* encrypted_value = NULL; - ckmc_param_list_h param; - ckmc_raw_buffer_s *ptext; - ckmc_raw_buffer_s *ctext; + ckmc_param_list_h param = NULL; + ckmc_raw_buffer_s *ptext = NULL; + ckmc_raw_buffer_s *ctext = NULL; if (!passphrase) return NULL; @@ -193,7 +193,8 @@ gchar* _netconfig_encrypt_passphrase(const gchar *passphrase) ckmc_buffer_free(ptext);\ g_free(origin_value)); - if ((encrypted_value = g_try_malloc0(ctext->size * 2 + 1)) == NULL) { + if (ctext == NULL || + (encrypted_value = g_try_malloc0(ctext->size * 2 + 1)) == NULL) { DBG(" encrypted_value allocation failed"); ckmc_param_list_free(param); ckmc_buffer_free(ptext); @@ -220,8 +221,8 @@ static gchar* _netconfig_decrypt_passphrase(const gchar *enc_data) gchar *passphrase = NULL; ckmc_param_list_h param = NULL; - ckmc_raw_buffer_s *ptext; - ckmc_raw_buffer_s *ctext; + ckmc_raw_buffer_s *ptext = NULL; + ckmc_raw_buffer_s *ctext = NULL; if (!enc_data) return NULL; @@ -262,7 +263,8 @@ static gchar* _netconfig_decrypt_passphrase(const gchar *enc_data) ckmc_buffer_free(ctext);\ g_free(encrypted_value)); - passphrase = g_strdup((const gchar*)ptext->data); + if (ptext != NULL) + passphrase = g_strdup((const gchar*)ptext->data); ckmc_param_list_free(param); ckmc_buffer_free(ctext); -- 2.34.1