From: tasn Date: Mon, 11 Jul 2011 11:20:42 +0000 (+0000) Subject: Evas textblock: Fixed an issue with string_escaped_get. X-Git-Tag: 2.0_alpha~240^2~315 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4259441e974defe2f97b36099f740f2afb9bccd8;p=framework%2Fuifw%2Fevas.git Evas textblock: Fixed an issue with string_escaped_get. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@61235 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/src/lib/canvas/evas_object_textblock.c b/src/lib/canvas/evas_object_textblock.c index 0213923..05d4d69 100644 --- a/src/lib/canvas/evas_object_textblock.c +++ b/src/lib/canvas/evas_object_textblock.c @@ -4528,6 +4528,7 @@ static inline int _escaped_is_eq_and_advance(const char *s, const char *s_end, const char **p_m, const char *m_end) { + Eina_Bool reached_end; for (;((s < s_end) && (*p_m < m_end)); s++, (*p_m)++) { if (*s != **p_m) @@ -4537,10 +4538,11 @@ _escaped_is_eq_and_advance(const char *s, const char *s_end, } } + reached_end = !**p_m; if (*p_m < m_end) _escaped_advance_after_end_of_string(p_m); - return s == s_end; + return ((s == s_end) && reached_end); } /**