From 139e49792dc55e83416cda3ed2688d847b4f6d03 Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Fri, 6 May 2011 09:00:44 +0000 Subject: [PATCH] evas: don't assume anymore that text_node is != NULL. SVN revision: 59231 --- legacy/evas/src/lib/canvas/evas_object_textblock.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c index cdd06700ab..08535ca0e0 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c @@ -3162,6 +3162,7 @@ _layout_get_wordwrap(Ctxt *c, Evas_Object_Textblock_Format *fmt, const Evas_Object_Textblock_Text_Item *ti, size_t line_start, const char *breaks) { + if (!ti->parent.text_node) return -1; return _layout_get_word_mixwrap_common(c, fmt, ti, EINA_FALSE, line_start, breaks); } @@ -3172,6 +3173,7 @@ _layout_get_mixedwrap(Ctxt *c, Evas_Object_Textblock_Format *fmt, const Evas_Object_Textblock_Text_Item *ti, size_t line_start, const char *breaks) { + if (!ti->parent.text_node) return -1; return _layout_get_word_mixwrap_common(c, fmt, ti, EINA_TRUE, line_start, breaks); } @@ -3403,7 +3405,7 @@ _layout_visualize_par(Ctxt *c) if (!line_breaks) { /* Only relevant in those cases */ - if (it->format->wrap_word || it->format->wrap_mixed) + if ((it->format->wrap_word || it->format->wrap_mixed) && it->text_node) { size_t len = eina_ustrbuf_length_get(