diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-06-16 15:03:09 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-06-16 15:01:42 -0400 |
| commit | 4bf13c5c0c04c75305ca7c593f80a8f0f0f94c86 (patch) | |
| tree | ba218c77e04d283d9eabded8b6f9350cd79f5edc | |
| parent | a4fcc0595ec2af610f68cab823049416d1e903ca (diff) | |
| download | efl-4bf13c5c0c04c75305ca7c593f80a8f0f0f94c86.tar.gz | |
evas: add null checks for textblock stuff
this prevents a crash when starting verne but should be reverted when
a more appropriate fix can be put in place
ref T5585
| -rw-r--r-- | src/lib/evas/canvas/evas_object_textblock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 05ebba9e4c..268f9e33a9 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -3437,7 +3437,7 @@ _layout_format_pop(Ctxt *c, const char *format) * I.e whole of the ending tag matches the start of the * starting tag, and the starting tag's next char is either * NULL or white. Skip the starting '+'. */ - if (_FORMAT_IS_CLOSER_OF( + if (fmt->fnode && _FORMAT_IS_CLOSER_OF( fmt->fnode->orig_format, format + 1, len - 1)) { _format_unref_free(c->obj, fmt); @@ -3445,7 +3445,7 @@ _layout_format_pop(Ctxt *c, const char *format) } else { - redo_nodes = eina_list_prepend(redo_nodes, fmt->fnode); + if (fmt->fnode) redo_nodes = eina_list_prepend(redo_nodes, fmt->fnode); _format_unref_free(c->obj, fmt); } } |