diff options
author | Denis Kenzior <denkenz@gmail.com> | 2010-10-14 02:58:07 -0500 |
---|---|---|
committer | Denis Kenzior <denkenz@gmail.com> | 2010-10-14 02:59:15 -0500 |
commit | 8820e18b53bf11028185d058e57b061977a56dd2 (patch) | |
tree | 9b1f7171f1ebb602126494f618d282a0247a82a5 /src/stkagent.c | |
parent | 00ad02c29da7e95624e36189248bc7411c42f95c (diff) | |
download | ofono-8820e18b53bf11028185d058e57b061977a56dd2.tar.bz2 |
stkagent: Handle NULL items in append_menu_items
Diffstat (limited to 'src/stkagent.c')
-rw-r--r-- | src/stkagent.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/stkagent.c b/src/stkagent.c index 354b87da..bba29f45 100644 --- a/src/stkagent.c +++ b/src/stkagent.c @@ -240,7 +240,7 @@ static void append_menu_items(DBusMessageIter *iter, dbus_message_iter_open_container(iter, DBUS_TYPE_ARRAY, "(sy)", &array); - for (; item->text; item++) { + while (item && item->text) { dbus_message_iter_open_container(&array, DBUS_TYPE_STRUCT, NULL, &entry); @@ -250,6 +250,7 @@ static void append_menu_items(DBusMessageIter *iter, &item->icon_id); dbus_message_iter_close_container(&array, &entry); + item++; } dbus_message_iter_close_container(iter, &array); |