jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ce166ec2232f7628fe5f57603b58c4e620c60567
commit ce166ec2232f7628fe5f57603b58c4e620c60567
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Mon Dec 9 17:28:02 2013 +0900
Evas: Fix crash in GL engine(s) during preload cancel
In my config, running terminology with the GL engine and under
cserve2, some image could not be loaded. The tex argument
in evas_gl_preload_target_[un]register was NULL, leading to
an immediate crash.
---
src/modules/evas/engines/gl_common/evas_gl_preload.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_preload.c
b/src/modules/evas/engines/gl_common/evas_gl_preload.c
index fee5823..1995232 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_preload.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_preload.c
@@ -408,6 +408,8 @@ _evas_gl_preload_target_die(void *data, Eo *obj,
void
evas_gl_preload_target_register(Evas_GL_Texture *tex, Eo *target)
{
+ EINA_SAFETY_ON_NULL_RETURN(tex);
+
eo_do(target,
eo_event_callback_add(EO_EV_DEL, _evas_gl_preload_target_die, tex));
tex->targets = eina_list_append(tex->targets, target);
@@ -420,6 +422,8 @@ evas_gl_preload_target_unregister(Evas_GL_Texture *tex, Eo
*target)
Eina_List *l;
const Eo *o;
+ EINA_SAFETY_ON_NULL_RETURN(tex);
+
eo_do(target,
eo_event_callback_del(EO_EV_DEL, _evas_gl_preload_target_die, tex));
--
