colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ussd: fix leaked callback info in error cases

Browse Source
This commit is contained in:
Dan Williams
2011-06-09 14:46:03 -05:00
parent f9f6d1dfdb
commit e5c967508d
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mm-generic-gsm.c
View File

@@ -4811,9 +4811,8 @@ ussd_initiate (MMModemGsmUssd *modem,
MMCallbackInfo *info; MMCallbackInfo *info;
MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (modem); MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (modem);
info = mm_callback_info_string_new (MM_MODEM (modem), callback, user_data);
if (priv->ussd_state != MM_MODEM_GSM_USSD_STATE_IDLE) { if (priv->ussd_state != MM_MODEM_GSM_USSD_STATE_IDLE) {
info = mm_callback_info_string_new (MM_MODEM (modem), callback, user_data);
info->error = g_error_new (MM_MODEM_ERROR, info->error = g_error_new (MM_MODEM_ERROR,
MM_MODEM_ERROR_GENERAL, MM_MODEM_ERROR_GENERAL,
"USSD session already active."); "USSD session already active.");
@@ -4832,9 +4831,8 @@ ussd_respond (MMModemGsmUssd *modem,
MMCallbackInfo *info; MMCallbackInfo *info;
MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (modem); MMGenericGsmPrivate *priv = MM_GENERIC_GSM_GET_PRIVATE (modem);
info = mm_callback_info_string_new (MM_MODEM (modem), callback, user_data);
if (priv->ussd_state != MM_MODEM_GSM_USSD_STATE_USER_RESPONSE) { if (priv->ussd_state != MM_MODEM_GSM_USSD_STATE_USER_RESPONSE) {
info = mm_callback_info_string_new (MM_MODEM (modem), callback, user_data);
info->error = g_error_new (MM_MODEM_ERROR, info->error = g_error_new (MM_MODEM_ERROR,
MM_MODEM_ERROR_GENERAL, MM_MODEM_ERROR_GENERAL,
"No active USSD session, cannot respond."); "No active USSD session, cannot respond.");