Fix memory leak issue

cp_name must be freed after inqueue

Change-Id: Ief3f9e30f5ffd23fc9dd2a3832fb410e5ae92507

diff --git a/packaging/tel-plugin-dbus_tapi.spec b/packaging/tel-plugin-dbus_tapi.spec
index 5f490ac851ee7e6cbc2926d31a402e78819ddc39..0adfcbde40e85cae867580f50eec1715528c482b 100644 (file)
--- a/packaging/tel-plugin-dbus_tapi.spec
+++ b/packaging/tel-plugin-dbus_tapi.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 3
-%define patchlevel 75
+%define patchlevel 76
 
 Name:           tel-plugin-dbus_tapi
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/dtapi_sat_manager.c b/src/dtapi_sat_manager.c
index 18a97f7baf0bb6af7b2033259718238b6e52a6e6..d50b756abf35aefab070168fa4b2ff16cc446e61 100644 (file)
--- a/src/dtapi_sat_manager.c
+++ b/src/dtapi_sat_manager.c
@@ -657,8 +657,8 @@ GVariant* sat_manager_caching_setup_menu_info(struct custom_data *ctx, const cha
        q_data.cmd_type = SAT_PROATV_CMD_SETUP_MENU;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.setupMenuInd), setup_menu_tlv, sizeof(struct tel_sat_setup_menu_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -793,8 +793,8 @@ GVariant* sat_manager_display_text_noti(struct custom_data *ctx, const char *cp_
        q_data.cmd_type = SAT_PROATV_CMD_DISPLAY_TEXT;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.displayTextInd), display_text_tlv, sizeof(struct tel_sat_display_text_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -915,8 +915,8 @@ GVariant* sat_manager_select_item_noti(struct custom_data *ctx, const char *cp_n
        q_data.cmd_type = SAT_PROATV_CMD_SELECT_ITEM;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.selectItemInd), select_item_tlv, sizeof(struct tel_sat_select_item_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -1034,8 +1034,8 @@ GVariant* sat_manager_get_inkey_noti(struct custom_data *ctx, const char *cp_nam
        q_data.cmd_type = SAT_PROATV_CMD_GET_INKEY;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.getInkeyInd), get_inkey_tlv, sizeof(struct tel_sat_get_inkey_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -1162,8 +1162,8 @@ GVariant* sat_manager_get_input_noti(struct custom_data *ctx, const char *cp_nam
        q_data.cmd_type = SAT_PROATV_CMD_GET_INPUT;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.getInputInd), get_input_tlv, sizeof(struct tel_sat_get_input_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -1229,8 +1229,8 @@ GVariant* sat_manager_play_tone_noti(struct custom_data *ctx, const char *cp_nam
        q_data.cmd_type = SAT_PROATV_CMD_PLAY_TONE;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.play_tone), play_tone_tlv, sizeof(struct tel_sat_play_tone_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -1310,8 +1310,8 @@ GVariant* sat_manager_send_sms_noti(struct custom_data *ctx, const char *cp_name
        q_data.cmd_type = SAT_PROATV_CMD_SEND_SMS;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.sendSMSInd), send_sms_tlv, sizeof(struct tel_sat_send_sms_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -1411,8 +1411,8 @@ GVariant* sat_manager_send_ss_noti(struct custom_data *ctx, const char *cp_name,
        q_data.cmd_type = SAT_PROATV_CMD_SEND_SS;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.send_ss), send_ss_tlv, sizeof(struct tel_sat_send_ss_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -1545,8 +1545,8 @@ GVariant* sat_manager_send_ussd_noti(struct custom_data *ctx, const char *cp_nam
        q_data.cmd_type = SAT_PROATV_CMD_SEND_USSD;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.send_ussd), send_ussd_tlv, sizeof(struct tel_sat_send_ussd_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -1657,8 +1657,8 @@ GVariant* sat_manager_setup_call_noti(struct custom_data *ctx, const char *cp_na
        q_data.cmd_type = SAT_PROATV_CMD_SETUP_CALL;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.setup_call), setup_call_tlv, sizeof(struct tel_sat_setup_call_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -1808,8 +1808,8 @@ GVariant* sat_manager_setup_idle_mode_text_noti(struct custom_data *ctx, const c
        q_data.cmd_type = SAT_PROATV_CMD_SETUP_IDLE_MODE_TEXT;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.idle_mode), idle_mode_tlv, sizeof(struct tel_sat_setup_idle_mode_text_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -2113,9 +2113,8 @@ GVariant* sat_manager_open_channel_noti(struct custom_data *ctx, const char *cp_
        q_data.cmd_type = SAT_PROATV_CMD_OPEN_CHANNEL;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.open_channel), open_channel_tlv, sizeof(struct tel_sat_open_channel_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
-
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_STK_HIDE_ALPHA_ID)
@@ -2182,8 +2181,8 @@ GVariant* sat_manager_close_channel_noti(struct custom_data *ctx, const char *cp
        q_data.cmd_type = SAT_PROATV_CMD_CLOSE_CHANNEL;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.close_channel), close_channel_tlv, sizeof(struct tel_sat_close_channel_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -2243,8 +2242,8 @@ GVariant* sat_manager_receive_data_noti(struct custom_data *ctx, const char *cp_
        q_data.cmd_type = SAT_PROATV_CMD_RECEIVE_DATA;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.receive_data), receive_data_tlv, sizeof(struct tel_sat_receive_channel_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -2317,8 +2316,8 @@ GVariant* sat_manager_send_data_noti(struct custom_data *ctx, const char *cp_nam
        q_data.cmd_type = SAT_PROATV_CMD_SEND_DATA;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.send_data), send_data_tlv, sizeof(struct tel_sat_send_channel_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -2358,8 +2357,8 @@ GVariant* sat_manager_get_channel_status_noti(struct custom_data *ctx, const cha
        q_data.cmd_type = SAT_PROATV_CMD_GET_CHANNEL_STATUS;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.get_channel_status), get_channel_status_tlv, sizeof(struct tel_sat_get_channel_status_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
        get_channel_status = g_variant_new("(i)", command_id);
@@ -2421,8 +2420,8 @@ GVariant* sat_manager_refresh_noti(struct custom_data *ctx, const char *cp_name,
                q_data.cmd_type = SAT_PROATV_CMD_REFRESH;
                q_data.cp_name = g_strdup(cp_name);
                memcpy((void*)&(q_data.cmd_data.refresh), refresh_tlv, sizeof(struct tel_sat_refresh_tlv));
-               if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-                       g_free(q_data.cp_name);
+               sat_manager_enqueue_cmd(ctx, &q_data);
+               g_free(q_data.cp_name);
                command_id = q_data.cmd_id;
 #endif
 
@@ -2557,8 +2556,8 @@ GVariant* sat_manager_send_dtmf_noti(struct custom_data *ctx, const char *cp_nam
        q_data.cmd_type = SAT_PROATV_CMD_SEND_DTMF;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.send_dtmf), send_dtmf_tlv, sizeof(struct tel_sat_send_dtmf_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -2725,8 +2724,8 @@ GVariant* sat_manager_launch_browser_noti(struct custom_data *ctx, const char *c
        q_data.cmd_type = SAT_PROATV_CMD_LAUNCH_BROWSER;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.launch_browser), launch_browser_tlv, sizeof(struct tel_sat_launch_browser_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
 #if defined(TIZEN_SUPPORT_SAT_ICON)
@@ -2897,8 +2896,8 @@ GVariant* sat_manager_language_notification_noti(struct custom_data *ctx, const
        q_data.cmd_type = SAT_PROATV_CMD_LANGUAGE_NOTIFICATION;
        q_data.cp_name = g_strdup(cp_name);
        memcpy((void*)&(q_data.cmd_data.language_notification), language_notification_tlv, sizeof(struct tel_sat_language_notification_tlv));
-       if (FALSE == sat_manager_enqueue_cmd(ctx, &q_data))
-               g_free(q_data.cp_name);
+       sat_manager_enqueue_cmd(ctx, &q_data);
+       g_free(q_data.cp_name);
        command_id = q_data.cmd_id;
 
        language_noti = g_variant_new("(iib)", command_id, language, b_specified);