From e5c967508d40a008eb2809628da01ed36c96511b Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 9 Jun 2011 14:46:03 -0500 Subject: ussd: fix leaked callback info in error cases --- src/mm-generic-gsm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/mm-generic-gsm.c b/src/mm-generic-gsm.c index 29203ab0..479033d6 100644 --- a/src/mm-generic-gsm.c +++ b/src/mm-generic-gsm.c @@ -4811,9 +4811,8 @@ ussd_initiate (MMModemGsmUssd *modem, MMCallbackInfo *info; 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) { + info = mm_callback_info_string_new (MM_MODEM (modem), callback, user_data); info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, "USSD session already active."); @@ -4832,9 +4831,8 @@ ussd_respond (MMModemGsmUssd *modem, MMCallbackInfo *info; 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) { + info = mm_callback_info_string_new (MM_MODEM (modem), callback, user_data); info->error = g_error_new (MM_MODEM_ERROR, MM_MODEM_ERROR_GENERAL, "No active USSD session, cannot respond."); -- cgit v1.2.3-70-g09d2