From 7c14357161e9aa2da286090863a870bde711e858 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Mon, 11 Jul 2011 11:20:42 +0000 Subject: [PATCH] Evas textblock: Fixed an issue with string_escaped_get. SVN revision: 61235 --- 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 0213923378..05d4d69d86 100644 --- a/legacy/evas/src/lib/canvas/evas_object_textblock.c +++ b/legacy/evas/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); } /**