Skip to contentSkip to conversation

gisi: fix use of unitialised variable.

PATCH In review Andrzej Zaborowski 2 participants 6 messages Dec 23, 2010 – Dec 24, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gisi: fix use of unitialised variable.

Set no msg.version if it's not available.

---
 gisi/modem.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
gisi/modem.c +2 -1
index ff06cf2..9fb4d34 100644
@@ -293,7 +293,6 @@ static gboolean isi_callback(GIOChannel *channel, GIOCondition cond,
 		msg.error = 0;
 		msg.data = buf;
 		msg.len = len;
-		msg.version = &mux->version;
 
 		if (modem->trace != NULL)
 			modem->trace(&msg, NULL);
@@ -311,6 +310,8 @@ static gboolean isi_callback(GIOChannel *channel, GIOCondition cond,
 			return TRUE;
 		}
 
+		msg.version = &mux->version;
+
 		if (g_isi_msg_id(&msg) == COMMON_MESSAGE)
 			common_message_decode(mux, &msg);
 
Signature · 1 line
1.7.1.86.g0e460.dirty
#1 lore raw

PATCH 1/1 n900: remove unneeded g_isi_client_destroy call.

"client" is either NULL or uninitialised in this place.

---
 plugins/n900.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
plugins/n900.c +0 -1
index 711f4ed..29daf05 100644
@@ -382,7 +382,6 @@ static int n900_probe(struct ofono_modem *modem)
 	return 0;
 
 error:
-	g_isi_client_destroy(client);
 	g_isi_modem_destroy(isimodem);
 	gpio_remove(modem);
 	g_free(isi);
Signature · 1 line
1.7.1.86.g0e460.dirty
#2 lore raw

Re: [PATCH] n900: remove unneeded g_isi_client_destroy call.

Hi Andrew,

Quoted 5 lines · Andrzej Zaborowski

"client" is either NULL or uninitialised in this place.

---
 plugins/n900.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

Patch has been applied, thanks.

Regards,
-Denis

#3 lore raw

PATCH 1/2 stk: Send the AlphaId's to agent.

In reply to Andrzej Zaborowski

v2: Method name changed according to irc talk.
v3: Terminate session if return signature doesn't match but allow agent to return from the call if it does match.

---
 src/stk.c      |    9 +++++++--
 src/stkagent.c |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/stkagent.h |    3 +++
 3 files changed, 59 insertions(+), 2 deletions(-)
src/stk.c +7 -2
index 87208d1..9dcbda6 100644
@@ -472,12 +472,17 @@ static void stk_alpha_id_set(struct ofono_stk *stk,
 		const char *text, const struct stk_text_attribute *attr,
 		const struct stk_icon_id *icon)
 {
-	/* TODO */
+	char *alpha = dbus_apply_text_attributes(text, attr);
+
+	if (alpha || icon)
+		stk_agent_display_action_info(stk->current_agent, alpha, icon);
+
+	g_free(alpha);
 }
 
 static void stk_alpha_id_unset(struct ofono_stk *stk)
 {
-	/* TODO */
+	stk_agent_request_cancel(stk->current_agent);
 }
 
 static int duration_to_msecs(const struct stk_duration *duration)
src/stkagent.c +49 -0

52 lines not on this page · raw message

src/stkagent.h +3 -0
index 517bcfe..6477dbf 100644
@@ -137,3 +137,6 @@ int stk_agent_loop_tone(struct stk_agent *agent, const char *text,
 
 void append_menu_items_variant(DBusMessageIter *iter,
 				const struct stk_menu_item *items);
+
+int stk_agent_display_action_info(struct stk_agent *agent, const char *text,
+					const struct stk_icon_id *icon);
Signature · 1 line
1.7.1.86.g0e460.dirty
#4 lore raw

Re: [PATCH 1/2] stk: Send the AlphaId's to agent.

Hi Andrew,

Quoted 9 lines · Andrzej Zaborowski

v2: Method name changed according to irc talk.
v3: Terminate session if return signature doesn't match but allow agent to return from the call if it does match.

---
 src/stk.c      |    9 +++++++--
 src/stkagent.c |   49 +++++++++++++++++++++++++++++++++++++++++++++++++
 src/stkagent.h |    3 +++
 3 files changed, 59 insertions(+), 2 deletions(-)

Patch has been applied, thanks.

Regards,
-Denis

#5 lore raw
In reply to Andrzej Zaborowski

Hi Andrew,

Quoted 5 lines · Andrzej Zaborowski

Set no msg.version if it's not available.

---
 gisi/modem.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

Patch has been applied, thanks.

Regards,
-Denis