hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9e57d348935c7c417e96b6af122e0990f21169a3
commit 9e57d348935c7c417e96b6af122e0990f21169a3 Author: SangHyeon Lee <sh10233....@samsung.com> Date: Tue Jun 23 08:11:39 2015 +0900 fb engine : Add NULL type handling in output free. Summary: Add NULL type check in output_free of evas fb engine. If engine setup is failed, Render_Engine wil be NULL so output_free also need to handling NULL check. Test Plan: It needs specific condition to reproduce, engine of ecore_evas is set to fb, and setup is failed, then Render_Engine is NULL, but ecore_evas_free will call output_free in fb engine's evas_engine.c Reviewers: raster, cedric, Hermet Reviewed By: Hermet Subscribers: cedric, seoz, eagleeye, singh.amitesh Differential Revision: https://phab.enlightenment.org/D2743 --- src/modules/evas/engines/fb/evas_engine.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/modules/evas/engines/fb/evas_engine.c b/src/modules/evas/engines/fb/evas_engine.c index 21e124b..875cba4 100644 --- a/src/modules/evas/engines/fb/evas_engine.c +++ b/src/modules/evas/engines/fb/evas_engine.c @@ -114,10 +114,11 @@ eng_output_free(void *data) { Render_Engine *re; - re = (Render_Engine *)data; - - evas_render_engine_software_generic_clean(&re->generic); - free(re); + if (re = (Render_Engine *)data) + { + evas_render_engine_software_generic_clean(&re->generic); + free(re); + } evas_common_shutdown(); } --