[PATCH 11/11] Handle the comprehension tlv with bad format in parse_dataobj()

[Yang Gu]

---
 src/stkutil.c |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/stkutil.c b/src/stkutil.c
index b830291..937ef1a 100644
--- a/src/stkutil.c
+++ b/src/stkutil.c
@@ -910,7 +910,6 @@ static gboolean parse_dataobj(struct comprehension_tlv_iter 
*iter,
        entries = g_slist_reverse(entries);
 
        for (l = entries; l; l = l->next) {
-               gboolean ret;
                dataobj_handler handler;
                struct dataobj_handler_entry *entry = l->data;
 
@@ -918,15 +917,12 @@ static gboolean parse_dataobj(struct 
comprehension_tlv_iter *iter,
                if (handler == NULL)
                        continue;
 
-               if (comprehension_tlv_iter_get_tag(iter) == entry->type)
-                       ret = handler(iter, entry->data);
-               else
-                       ret = FALSE;
-
-               entry->parsed = ret;
-
-               if (ret && comprehension_tlv_iter_next(iter) == FALSE)
-                       break;
+               if (comprehension_tlv_iter_get_tag(iter) == entry->type) {
+                       if (handler(iter, entry->data))
+                               entry->parsed = TRUE;
+                       if (comprehension_tlv_iter_next(iter) == FALSE)
+                               break;
+               }
        }
 
        for (l = entries; l; l = l->next) {
-- 
1.6.3.3

_______________________________________________
ofono mailing list
ofono@ofono.org
http://lists.ofono.org/listinfo/ofono