From b7036e67ae2387153efc177cbad457760efb1195 Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Sun, 23 May 2010 23:05:51 +0000 Subject: [PATCH] Fix potential segfault when loading/unloading modules. SVN revision: 49168 --- src/modules/gadman/e_mod_gadman.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/modules/gadman/e_mod_gadman.c b/src/modules/gadman/e_mod_gadman.c index 0f8b318c3..c06309577 100644 --- a/src/modules/gadman/e_mod_gadman.c +++ b/src/modules/gadman/e_mod_gadman.c @@ -141,8 +141,11 @@ gadman_populate_class(void *data, E_Gadcon *gc, const E_Gadcon_Client_Class *cc) { if (cf_gcc->name && cc->name && !strcmp(cf_gcc->name, cc->name) && (gc->cf->zone == gc->zone->id)) { - EINA_LIST_FOREACH(Man->gadgets[layer], ll, gcc) - if (gcc->cf->id == cf_gcc->id) break; + EINA_LIST_FOREACH(Man->gadgets[layer], ll, gcc) + { + if ((gcc->cf) && (gcc->cf->id) && (cf_gcc->id)) + if (gcc->cf->id == cf_gcc->id) break; + } if (!gcc) gadman_gadget_place(cf_gcc, layer, gc->zone); } }