From 0a0b83b51fa081ad847bd1c4d0c9576b12989ea7 Mon Sep 17 00:00:00 2001 From: Jiwan Kim Date: Thu, 2 Feb 2017 08:45:22 +0900 Subject: [PATCH] Add missing memory deallocation - ZigbeeServiceInterfaceRespCbData_t was not deallocated in some case. - Add g_free() for above cases. Change-Id: I09b8433251b0dad88c7e9866eb03da98ec8bf13c Signed-off-by: Jiwan Kim --- .../src/zigbee_service_dbus_interface_service.c | 10 ++++++++++ .../src/zigbee_service_dbus_interface_zcl_on_off.c | 2 ++ 2 files changed, 12 insertions(+) diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_service.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_service.c index 0b9a477..635d8f1 100644 --- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_service.c +++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_service.c @@ -59,6 +59,7 @@ static void on_service_enable_resp(ZigBeeServiceInterface *service_interface, if (NULL == resp_data || 0 == resp_data_len) { Z_LOGE("resp_data is null"); + g_free(cb_data); return; } @@ -132,6 +133,7 @@ static void on_service_disable_resp(ZigBeeServiceInterface *service_interface, if (NULL == resp_data || 0 == resp_data_len) { Z_LOGE("resp_data is null"); + g_free(cb_data); return; } @@ -204,6 +206,7 @@ static void on_service_zb_hw_reset_resp(ZigBeeServiceInterface *service_interfac if (NULL == resp_data || 0 == resp_data_len) { Z_LOGE("resp_data is null"); + g_free(cb_data); return; } @@ -276,6 +279,7 @@ static void on_service_form_network_resp(ZigBeeServiceInterface *service_interfa if (NULL == resp_data || 0 == resp_data_len) { Z_LOGE("resp_data is null"); + g_free(cb_data); return; } @@ -348,6 +352,7 @@ static void on_service_coex_start_resp(ZigBeeServiceInterface *service_interface if (NULL == resp_data || 0 == resp_data_len) { Z_LOGE("resp_data is null"); + g_free(cb_data); return; } @@ -427,6 +432,7 @@ static void on_service_coex_stop_resp(ZigBeeServiceInterface *service_interface, if (NULL == resp_data || 0 == resp_data_len) { Z_LOGE("resp_data is null"); + g_free(cb_data); return; } @@ -499,6 +505,7 @@ static void on_service_leave_network_resp(ZigBeeServiceInterface *service_interf if (NULL == resp_data || 0 == resp_data_len) { Z_LOGE("resp_data is null"); + g_free(cb_data); return; } @@ -575,6 +582,7 @@ static void on_service_get_network_info_resp(ZigBeeServiceInterface *service_int if (NULL == resp_data || 0 == resp_data_len) { Z_LOGE("resp_data is null"); + g_free(cb_data); return; } @@ -652,6 +660,7 @@ static void on_service_permit_join_resp(ZigBeeServiceInterface *service_interfac if (NULL == resp_data || 0 == resp_data_len) { Z_LOGE("resp_data is null"); + g_free(cb_data); return; } @@ -733,6 +742,7 @@ static void on_service_leave_request_resp(ZigBeeServiceInterface *service_interf if (NULL == resp_data || 0 == resp_data_len) { Z_LOGE("resp_data is null"); + g_free(cb_data); return; } diff --git a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_on_off.c b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_on_off.c index ab6a7b9..17d2bde 100644 --- a/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_on_off.c +++ b/zigbee-daemon/zigbee-interface/src/zigbee_service_dbus_interface_zcl_on_off.c @@ -58,6 +58,7 @@ static void on_on_off_set_on_off_resp(ZigBeeServiceInterface *service_interface, if (NULL == resp_data || 0 == resp_data_len) { Z_LOGE("resp_data is null"); + g_free(cb_data); return; } @@ -142,6 +143,7 @@ static void on_on_off_get_on_off_state_resp(ZigBeeServiceInterface *service_inte if (NULL == resp_data || 0 == resp_data_len) { Z_LOGE("resp_data is null"); + g_free(cb_data); return; } -- 2.7.4