jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=722725dfc53e4f0b9d719e2f58bc63e38385d0d6
commit 722725dfc53e4f0b9d719e2f58bc63e38385d0d6
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Wed Jul 5 17:39:55 2017 +0900
evas: Fix a crash in textblock
I could not reproduce it but the case should not happen,
so I'm adding a safety check rather than a silent return.
The private data should be NULL only after evas_object_free()
or before construction...
Fixes T5656
---
src/lib/evas/canvas/evas_object_textblock.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/evas/canvas/evas_object_textblock.c
b/src/lib/evas/canvas/evas_object_textblock.c
index aea815f884..59a58514bc 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -14208,7 +14208,7 @@ done:
static void
evas_object_textblock_render_post(Evas_Object *eo_obj EINA_UNUSED,
Evas_Object_Protected_Data *obj,
- void *type_private_data EINA_UNUSED)
+ void *type_private_data)
{
/* Efl_Canvas_Text_Data *o; */
@@ -14221,6 +14221,7 @@ evas_object_textblock_render_post(Evas_Object *eo_obj
EINA_UNUSED,
/* move cur to prev safely for object data */
evas_object_cur_prev(obj);
/* o->prev = o->cur; */
+ EINA_SAFETY_ON_NULL_RETURN(type_private_data);
_filter_output_cache_prune(obj, type_private_data);
}
--
