From 213d70dca348ee89838cc2e95328bce75a29dc22 Mon Sep 17 00:00:00 2001 From: Jeevaka Badrappan Date: Fri, 15 Jul 2011 09:29:27 -0700 Subject: [PATCH] stk: Fix crash seen in stk_alpha_id_unset If there is no default agent, then current agent also will be NULL. So, call stk_agent_request_cancel only when there is a valid current agent. --- src/stk.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/stk.c b/src/stk.c index 4df23b55..e8ffb42b 100644 --- a/src/stk.c +++ b/src/stk.c @@ -529,7 +529,12 @@ static void stk_alpha_id_set(struct ofono_stk *stk, static void stk_alpha_id_unset(struct ofono_stk *stk) { - stk_agent_request_cancel(stk->current_agent); + /* + * If there is no default agent, then current agent also will be NULL. + * So, call request cancel only when there is a valid current agent. + */ + if (stk->current_agent) + stk_agent_request_cancel(stk->current_agent); } static int duration_to_msecs(const struct stk_duration *duration)