From 391c1476f4be3f0e743b5755c2f884ff4d9cb8b2 Mon Sep 17 00:00:00 2001 From: tasn Date: Wed, 13 Apr 2011 13:28:08 +0000 Subject: [PATCH] Evas textblock: Fix error messages about bad cutoff positions. This was caused because we failed to check text item's text boundaries and we tried splitting beyond them. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@58634 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/canvas/evas_object_textblock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c index d1c503c..150391f 100644 --- a/src/lib/canvas/evas_object_textblock.c +++ b/src/lib/canvas/evas_object_textblock.c @@ -2385,14 +2385,14 @@ _layout_text_cutoff_get(Ctxt *c, Evas_Object_Textblock_Format *fmt, */ static Evas_Object_Textblock_Text_Item * _layout_item_text_split_strip_white(Ctxt *c, - Evas_Object_Textblock_Text_Item *ti, Eina_List *lti, int cut) + Evas_Object_Textblock_Text_Item *ti, Eina_List *lti, size_t cut) { const Eina_Unicode *ts; Evas_Object_Textblock_Text_Item *new_ti = NULL, *white_ti = NULL; - int cut2; + size_t cut2; ts = GET_ITEM_TEXT(ti); - if (_is_white(ts[cut])) + if (!IS_AT_END(ti, (size_t) cut) && _is_white(ts[cut])) cut2 = cut + 1; else cut2 = cut; -- 2.7.4