From d7433b2bfe536539ffb582e12cf365ce31e4f2d9 Mon Sep 17 00:00:00 2001 From: Chris Michael Date: Fri, 5 Sep 2014 11:35:21 -0400 Subject: [PATCH] ecore: Check that eo_data_scope_get returns valid Ecore_Timer_Data before trying to use it eo_data_scope_get Could return NULL if it does not find valid ecore_timer_data on this object. We should check that return before just Assuming that timer data is valid. @fix Signed-off-by: Chris Michael --- src/lib/ecore/ecore_timer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/ecore/ecore_timer.c b/src/lib/ecore/ecore_timer.c index 17ab04251a..ff8e8b7e34 100644 --- a/src/lib/ecore/ecore_timer.c +++ b/src/lib/ecore/ecore_timer.c @@ -436,6 +436,8 @@ _ecore_timer_del(Ecore_Timer *obj) { Ecore_Timer_Data *timer = eo_data_scope_get(obj, MY_CLASS); + EINA_SAFETY_ON_NULL_RETURN_VAL(timer, NULL); + if (timer->frozen && !timer->references) { void *data = timer->data;