From f18b8a649a3cae8f5bb1144080681638c012dc4d Mon Sep 17 00:00:00 2001 From: Woochanlee Date: Thu, 2 May 2019 14:34:04 +0000 Subject: [PATCH] evas_object_textblock: Fix binary search fail. D8610 Makes API Testcase fault. "<" is never searching. @fix Reviewed-by: Marcel Hollerbach Differential Revision: https://phab.enlightenment.org/D8803 --- src/lib/evas/canvas/evas_object_textblock.c | 2 ++ src/tests/evas/evas_test_textblock.c | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c index 3848cf1..1e345a8 100644 --- a/src/lib/evas/canvas/evas_object_textblock.c +++ b/src/lib/evas/canvas/evas_object_textblock.c @@ -8457,6 +8457,8 @@ _markup_get_text_utf8_append(Eina_Strbuf *sbuf, const char *text) eina_strbuf_append(sbuf, "&"); else if (ch == '"') eina_strbuf_append(sbuf, """); + else if (ch == '\'') + eina_strbuf_append(sbuf, "'"); else if (ch == _PARAGRAPH_SEPARATOR) eina_strbuf_append(sbuf, ""); else if (ch == _REPLACEMENT_CHAR) diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c index b82e7e4..dc3f22d 100644 --- a/src/tests/evas/evas_test_textblock.c +++ b/src/tests/evas/evas_test_textblock.c @@ -3241,6 +3241,13 @@ EFL_START_TEST(evas_textblock_text_getters) fail_if(strcmp(tmp2, "aa")); free(tmp2); free(tmp); + + tmp = evas_textblock_text_markup_to_utf8(NULL, "<align=center>hello</align>&gt;"'"); + fail_if(strcmp(tmp, "hello>\"\'")); + tmp2 = evas_textblock_text_utf8_to_markup(NULL, tmp); + fail_if(strcmp(tmp2, "<align=center>hello</align>&gt;"'")); + free(tmp2); + free(tmp); } /* complex markup set/get */ -- 2.7.4