[EGIT] [core/efl] master 03/03: evas_object_textblock: Fix binary search fail.

[Woochanlee]

bu5hm4n pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=fdfb781e22ba42855ce11b495bfa6145fb48b17a

commit fdfb781e22ba42855ce11b495bfa6145fb48b17a
Author: Woochanlee <wc0917....@samsung.com>
Date:   Thu May 2 14:34:04 2019 +0000

    evas_object_textblock: Fix binary search fail.
    
    D8610 Makes API Testcase fault.
    
    "&lt" is never searching.
    
    @fix
    
    Reviewed-by: Marcel Hollerbach <m...@marcel-hollerbach.de>
    Differential Revision: https://phab.enlightenment.org/D8803
---
 src/lib/evas/canvas/evas_object_textblock.c | 4 +++-
 src/tests/evas/evas_test_textblock.c        | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/lib/evas/canvas/evas_object_textblock.c 
b/src/lib/evas/canvas/evas_object_textblock.c
index 0913fd30b7..bb8deab1ce 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -1271,8 +1271,8 @@ static const Escape_Value escape_values_e_common_sorted[] 
= {
    ESCAPE_VALUE("&amp;", "\x26"),
    ESCAPE_VALUE("&apos;", "\x27"),
    ESCAPE_VALUE("&gt;", "\x3e"),
-   ESCAPE_VALUE("&quot;", "\x22"),
    ESCAPE_VALUE("&lt;", "\x3c"),
+   ESCAPE_VALUE("&quot;", "\x22"),
 };
 
 /**
@@ -8185,6 +8185,8 @@ _markup_get_text_utf8_append(Eina_Strbuf *sbuf, const 
char *text)
            eina_strbuf_append(sbuf, "&amp;");
         else if (ch == '"')
            eina_strbuf_append(sbuf, "&quot;");
+        else if (ch == '\'')
+           eina_strbuf_append(sbuf, "&apos;");
         else if (ch == _PARAGRAPH_SEPARATOR)
            eina_strbuf_append(sbuf, "<ps/>");
         else if (ch == _REPLACEMENT_CHAR)
diff --git a/src/tests/evas/evas_test_textblock.c 
b/src/tests/evas/evas_test_textblock.c
index b82e7e4aaa..dc3f22d136 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, 
"&lt;align=center&gt;hello&lt;/align&gt;&amp;gt;&quot;&apos;");
+        fail_if(strcmp(tmp, "<align=center>hello</align>&gt;\"\'"));
+        tmp2 = evas_textblock_text_utf8_to_markup(NULL, tmp);
+        fail_if(strcmp(tmp2, 
"&lt;align=center&gt;hello&lt;/align&gt;&amp;gt;&quot;&apos;"));
+        free(tmp2);
+        free(tmp);
      }
 
    /* complex markup set/get */

--