discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=99d0f03c6fa966ac95930d076dc2bb70472029b6
commit 99d0f03c6fa966ac95930d076dc2bb70472029b6
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Mon Nov 2 16:07:52 2015 -0500
evas gl_drm: don't deref null ptr on output free
---
src/modules/evas/engines/gl_drm/evas_engine.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/modules/evas/engines/gl_drm/evas_engine.c
b/src/modules/evas/engines/gl_drm/evas_engine.c
index 0c02d03..bfa9d58 100644
--- a/src/modules/evas/engines/gl_drm/evas_engine.c
+++ b/src/modules/evas/engines/gl_drm/evas_engine.c
@@ -959,15 +959,17 @@ eng_output_free(void *data)
re = (Render_Engine *)data;
if (re)
{
+ Evas_Engine_Info_GL_Drm *info;
+
glsym_evas_gl_preload_render_relax(eng_preload_make_current,
eng_get_ob(re));
if (gl_wins == 1) glsym_evgl_engine_shutdown(re);
+ info = eng_get_ob(re)->info;
/* NB: evas_render_engine_software_generic_clean() frees ob */
evas_render_engine_software_generic_clean(&re->generic.software);
- eng_gbm_shutdown(eng_get_ob(re)->info);
-
+ eng_gbm_shutdown(info);
gl_wins--;
free(re);
--
