[PATCH v3] stk: Fix issue in stk_alpha_id_set

[PATCH v3] stk: Fix issue in stk_alpha_id_set

[Jeevaka Badrappan]

[-- Attachment #1: Type: text/plain, Size: 785 bytes --]

Fixes the crash seen with the null alpha identifier.
Also removed the icon check as icon will always be a valid pointer.
---
 src/stk.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/stk.c b/src/stk.c
index 29d2087..b0be7b8 100644
--- a/src/stk.c
+++ b/src/stk.c
@@ -479,7 +479,12 @@ static void stk_alpha_id_set(struct ofono_stk *stk,
 {
 	char *alpha = dbus_apply_text_attributes(text, attr);
 
-	if (alpha || icon)
+	/*
+	 * Currently, we are treating null data object(len = 0, no value part)
+	 * and no alpha identifier cases equally. This may be changed once
+	 * better idea is found out.
+	 */
+	if (alpha != NULL)
 		stk_agent_display_action_info(stk->current_agent, alpha, icon);
 
 	g_free(alpha);
-- 
1.7.0.4

Re: [PATCH v3] stk: Fix issue in stk_alpha_id_set

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 361 bytes --]

Hi Jeevaka,

On 01/26/2011 02:15 PM, Jeevaka Badrappan wrote:
> Fixes the crash seen with the null alpha identifier.
> Also removed the icon check as icon will always be a valid pointer.
> ---
>  src/stk.c |    7 ++++++-
>  1 files changed, 6 insertions(+), 1 deletions(-)
> 

Applied with a slightly modified commit description.

Regards,
-Denis