From b6488dec417f18ff0185ee1b25a408114a97c635 Mon Sep 17 00:00:00 2001 From: Andrzej Zaborowski Date: Fri, 20 Aug 2010 04:07:09 +0200 Subject: stk: reorder: Don't access freed memory in Send SMS Responding to the stk->pending_cmd frees it, we need to read it before that. --- src/stk.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/stk.c b/src/stk.c index dd9f4533..a7e594eb 100644 --- a/src/stk.c +++ b/src/stk.c @@ -695,6 +695,10 @@ static void send_sms_submit_cb(gboolean ok, void *data) return; } + if (stk->pending_cmd->send_sms.alpha_id && + stk->pending_cmd->send_sms.alpha_id[0]) + stk_alpha_id_unset(stk); + memset(&rsp, 0, sizeof(rsp)); if (ok == FALSE) @@ -702,10 +706,6 @@ static void send_sms_submit_cb(gboolean ok, void *data) if (stk_respond(stk, &rsp, stk_command_cb)) stk_command_cb(&failure, stk); - - if (stk->pending_cmd->send_sms.alpha_id && - stk->pending_cmd->send_sms.alpha_id[0]) - stk_alpha_id_unset(stk); } static gboolean handle_command_send_sms(const struct stk_command *cmd, -- cgit v1.2.3