okra pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=4a22d2f17893e8d2777e37eb1d077452d3499bcf
commit 4a22d2f17893e8d2777e37eb1d077452d3499bcf Author: Stephen 'Okra' Houston <[email protected]> Date: Fri Aug 25 14:57:45 2017 -0500 Don't dereference NULL pointers in sysinfo and cpuclock. This fixes @CID1379941 and @CID1379947 --- src/modules/sysinfo/cpuclock/cpuclock.c | 3 ++- src/modules/sysinfo/sysinfo.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/modules/sysinfo/cpuclock/cpuclock.c b/src/modules/sysinfo/cpuclock/cpuclock.c index 333d170e8..b9cb57c42 100644 --- a/src/modules/sysinfo/cpuclock/cpuclock.c +++ b/src/modules/sysinfo/cpuclock/cpuclock.c @@ -853,7 +853,8 @@ _cpuclock_cb_frequency_check_notify(void *data, Eina_Bool init_set = EINA_FALSE; Thread_Config *thc = data; - if (!thc->inst && !thc->inst->cfg) return; + if (!thc->inst) return; + if (!thc->inst->cfg) return; if (thc->inst->cfg->esm != E_SYSINFO_MODULE_CPUCLOCK && thc->inst->cfg->esm != E_SYSINFO_MODULE_SYSINFO) return; if ((thc->inst->cfg->cpuclock.status) && (status) && diff --git a/src/modules/sysinfo/sysinfo.c b/src/modules/sysinfo/sysinfo.c index 17b5ced32..17778ac4c 100644 --- a/src/modules/sysinfo/sysinfo.c +++ b/src/modules/sysinfo/sysinfo.c @@ -7,6 +7,7 @@ _sysinfo_removed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_data) { Instance *inst = data; + if (!inst) return; if (inst->o_main != event_data) return; sysinfo_batman_remove(inst, NULL, NULL, NULL); sysinfo_thermal_remove(inst, NULL, NULL, NULL); @@ -17,7 +18,7 @@ _sysinfo_removed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_data) evas_object_smart_callback_del_full(e_gadget_site_get(obj), "gadget_removed", _sysinfo_removed_cb, inst); evas_object_event_callback_del_full(inst->o_main, EVAS_CALLBACK_DEL, _sysinfo_deleted_cb, data); - if (inst && inst->cfg) + if (inst->cfg) { sysinfo_config->items = eina_list_remove(sysinfo_config->items, inst->cfg); if (inst->cfg->id >= 0) --
