Merge remote-tracking branch 'upstream/pull/138'

* upstream/pull/138
  ivi-id-agent: Fix invalid read reported by valgrind while stopping Weston

  Reviewed-by: Eugen Friedrich <efriedrich@de.adit-jv.com>
  Reviewed-by: Harsha M M <harsha.manjulamallikarjun@in.bosch.com>
  Tested-by: Doan Ngoc Au <au.doanngoc@vn.bosch.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c b/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c
index 227e739..0c8b532 100644
--- a/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c
+++ b/ivi-id-agent-modules/ivi-id-agent/src/ivi-id-agent.c
@@ -365,8 +365,10 @@ ivi_failed:
 static int32_t
 deinit(struct ivi_id_agent *ida)
 {
-    struct db_elem *db_elem;
-    wl_list_for_each(db_elem, &ida->app_list, link) {
+    struct db_elem *db_elem, *dl_elem_next;
+    wl_list_for_each_safe(db_elem, dl_elem_next, &ida->app_list, link) {
+        wl_list_remove(&db_elem->link);
+
         free(db_elem->cfg_app_id);
         free(db_elem->cfg_title);
         free(db_elem);