summaryrefslogtreecommitdiffstats
path: root/src/stk.c
diff options
context:
space:
mode:
authorDenis Kenzior <denkenz@gmail.com>2012-06-16 23:22:04 -0500
committerDenis Kenzior <denkenz@gmail.com>2012-06-16 23:22:04 -0500
commit2b606f548c0fd7632c5b0545dec01626cbe63d75 (patch)
treede60e1061915abbf97639e4458293c36df2b4668 /src/stk.c
parente0e6e2c439f62e101c4242b938c12cbbe826b49d (diff)
downloadofono-2b606f548c0fd7632c5b0545dec01626cbe63d75.tar.bz2
stk: Fix crash when envelope returns sync
ofonod[13066]: src/stk.c:stk_select_item() ofonod[13066]: src/stk.c:stk_select_item() ofonod[13066]: src/stk.c:stk_send_envelope() ofonod[13066]: drivers/qmimodem/stk.c:qmi_envelope() ofonod[13066]: src/stk.c:envelope_cb() length 0 ofonod[13066]: src/stk.c:menu_selection_envelope_cb() ofonod[13066]: Sending Menu Selection to UICC failed process 13066: arguments to dbus_message_new_error() were incorrect, assertion "reply_to != NULL" failed in file dbus-message.c line 1333. This is normally a bug in some application using the D-Bus library. D-Bus not built with -rdynamic so unable to print a backtrace ofonod[13066]: Aborting (signal 6) [./src/ofonod] ofonod[13066]: ++++++++ backtrace ++++++++
Diffstat (limited to 'src/stk.c')
-rw-r--r--src/stk.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/stk.c b/src/stk.c
index 2ccb25e3..7a7bd758 100644
--- a/src/stk.c
+++ b/src/stk.c
@@ -809,11 +809,12 @@ static DBusMessage *stk_select_item(DBusConnection *conn,
DBG("");
- if (stk_send_envelope(stk, &e, menu_selection_envelope_cb, 0))
- return __ofono_error_failed(msg);
-
stk->pending = dbus_message_ref(msg);
+ if (stk_send_envelope(stk, &e, menu_selection_envelope_cb, 0))
+ __ofono_dbus_pending_reply(&stk->pending,
+ __ofono_error_failed(stk->pending));
+
return NULL;
}