From 31e8a528b14ef06418d146a47782c63011c4bea7 Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Fri, 5 Aug 2016 19:41:59 +0900 Subject: [PATCH] ecore-con - fix complaint about null slave list due to shutdown so ecore-con already cleared the slaves list on shutdown but an ecore_thread may stillbe active and thus removing from a NULL slaves list wont work, so skip if slaves is NULL. @fix --- src/lib/ecore_con/ecore_con_info.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/ecore_con/ecore_con_info.c b/src/lib/ecore_con/ecore_con_info.c index d70eb064cc..093ab024c5 100644 --- a/src/lib/ecore_con/ecore_con_info.c +++ b/src/lib/ecore_con/ecore_con_info.c @@ -207,8 +207,9 @@ ecore_con_info_data_clear(void *info) static void _ecore_con_info_slave_free(CB_Data *cbdata) { - info_slaves = (CB_Data *)eina_inlist_remove(EINA_INLIST_GET(info_slaves), - EINA_INLIST_GET(cbdata)); + if (info_slaves) + info_slaves = (CB_Data *)eina_inlist_remove(EINA_INLIST_GET(info_slaves), + EINA_INLIST_GET(cbdata)); if (cbdata->result) free(cbdata->result); cbdata->result = NULL; if (cbdata->data) ecore_con_server_infos_del(cbdata->data, cbdata);