From: Tom Hacohen <tom@stosb.com>
Date: Wed, 16 Feb 2011 13:00:41 +0000 (+0000)
Subject: Evas textblock: Fixed possible issue with word/mixed wrapping.
X-Git-Tag: submit/devel/efl/20131022.203902~10396
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=52807e1550ec32fe7f2127e5e967c008f8694f7f;p=platform%2Fupstream%2Fefl.git

Evas textblock: Fixed possible issue with word/mixed wrapping.

SVN revision: 57089
---

diff --git a/legacy/evas/src/lib/canvas/evas_object_textblock.c b/legacy/evas/src/lib/canvas/evas_object_textblock.c
index 12d6bbf..6e932a7 100644
--- a/legacy/evas/src/lib/canvas/evas_object_textblock.c
+++ b/legacy/evas/src/lib/canvas/evas_object_textblock.c
@@ -3168,9 +3168,15 @@ _layout_get_word_mixwrap_common(Ctxt *c, Evas_Object_Textblock_Format *fmt,
              twrap = _layout_word_end(ti->text, wrap);
              wrap = _layout_word_next(ti->text, wrap);
              if (wrap >= 0)
-               return (str[wrap]) ? wrap : -1;
+               {
+                  ch = GET_NEXT(str, wrap);
+                  return (str[wrap]) ? wrap : -1;
+               }
              else if (twrap >= 0)
-               return (str[twrap]) ? twrap : -1;
+               {
+                  ch = GET_NEXT(str, twrap);
+                  return (str[twrap]) ? twrap : -1;
+               }
           }
      }
    return -1;