sailfishos/ofono
1
0
Fork 1
mirror of https://github.com/sailfishos/ofono synced 2025-11-28 13:41:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

[rilmodem] Fix stk mem leaks

Browse Source
This commit is contained in:
Tommi Kenakkala
2014-08-28 14:31:11 +03:00
parent ce2f0f3642
commit 0532e2a6ea
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ofono/drivers/rilmodem/stk.c
View File

@@ -81,11 +81,12 @@ static void ril_stk_envelope(struct ofono_stk *stk, int length,
DBG(""); DBG("");
hex_envelope = encode_hex(command, length, 0); hex_envelope = encode_hex(command, length, 0);
DBG("rilmodem envelope: %s", hex_envelope); DBG("rilmodem envelope: %s", hex_envelope);
parcel_init(&rilp); parcel_init(&rilp);
parcel_w_string(&rilp, hex_envelope); parcel_w_string(&rilp, hex_envelope);
g_free(hex_envelope);
hex_envelope = NULL;
ret = g_ril_send(sd->ril, request, ret = g_ril_send(sd->ril, request,
rilp.data, rilp.size, ril_envelope_cb, rilp.data, rilp.size, ril_envelope_cb,
@@ -132,11 +133,12 @@ static void ril_stk_terminal_response(struct ofono_stk *stk, int length,
DBG(""); DBG("");
hex_tr = encode_hex(resp, length, 0); hex_tr = encode_hex(resp, length, 0);
DBG("rilmodem terminal response: %s", hex_tr); DBG("rilmodem terminal response: %s", hex_tr);
parcel_init(&rilp); parcel_init(&rilp);
parcel_w_string(&rilp, hex_tr); parcel_w_string(&rilp, hex_tr);
g_free(hex_tr);
hex_tr = NULL;
ret = g_ril_send(sd->ril, request, ret = g_ril_send(sd->ril, request,
rilp.data, rilp.size, ril_tr_cb, rilp.data, rilp.size, ril_tr_cb,
@@ -194,7 +196,9 @@ static void ril_stk_pcmd_notify(struct ril_msg *message, gpointer user_data)
strlen(pcmd), strlen(pcmd),
&len, -1); &len, -1);
g_free(pcmd);
ofono_stk_proactive_command_notify(stk, len, (const guchar *)pdu); ofono_stk_proactive_command_notify(stk, len, (const guchar *)pdu);
g_free(pdu);
} }
static void ril_stk_event_notify(struct ril_msg *message, gpointer user_data) static void ril_stk_event_notify(struct ril_msg *message, gpointer user_data)
@@ -211,13 +215,14 @@ static void ril_stk_event_notify(struct ril_msg *message, gpointer user_data)
ril_util_init_parcel(message, &rilp); ril_util_init_parcel(message, &rilp);
pcmd = parcel_r_string(&rilp); pcmd = parcel_r_string(&rilp);
DBG("pcmd: %s", pcmd); DBG("pcmd: %s", pcmd);
pdu = decode_hex((const char *) pcmd, pdu = decode_hex((const char *) pcmd,
strlen(pcmd), strlen(pcmd),
&len, -1); &len, -1);
g_free(pcmd);
pcmd = NULL;
ofono_stk_proactive_command_handled_notify(stk, len, ofono_stk_proactive_command_handled_notify(stk, len,
(const guchar *)pdu); (const guchar *)pdu);
g_free(pdu);
} }
static void ril_stk_session_end_notify(struct ril_msg *message, static void ril_stk_session_end_notify(struct ril_msg *message,