From 09dba3e74670a1e9bc62ed4e9b02d03cbfdca83d Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Mon, 23 Apr 2012 00:34:17 +0000 Subject: [PATCH] edje: handle case when & is not escaped. SVN revision: 70401 --- legacy/edje/src/lib/edje_util.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/legacy/edje/src/lib/edje_util.c b/legacy/edje/src/lib/edje_util.c index 0dba28f8f4..9c217c856b 100644 --- a/legacy/edje/src/lib/edje_util.c +++ b/legacy/edje/src/lib/edje_util.c @@ -1192,6 +1192,7 @@ edje_object_part_text_escaped_set(Evas_Object *obj, const char *part, const char } else if (*p == 0) { + if (!s) s = esc_start; /* This would happen when there is & that isn't escaped */ eina_strbuf_append_length(sbuf, s, p - s); s = NULL; } @@ -1201,6 +1202,7 @@ edje_object_part_text_escaped_set(Evas_Object *obj, const char *part, const char if (*p == '&') { + if (!s) s = esc_start; /* This would happen when there is & that isn't escaped */ esc_start = p; esc_end = NULL; eina_strbuf_append_length(sbuf, s, p - s);