atspi: remove memory leak

The _elm_util_mkup_to_text gives alloacated plain text.
This plain text should be freed.

Change-Id: I4fe6443a2be78a80b00e79925b9ac968e489df76

diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 3fa019735932072242dc5985920976a254fa3e50..198a401b28edd71aab6da835293bab2cf6db1da9 100644 (file)
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -1796,7 +1796,8 @@ _elm_ctxpopup_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Ctxpop
    eo_do_super(eo_it, ELM_CTXPOPUP_ITEM_CLASS, accessible_name = (char *)elm_interface_atspi_accessible_name_get());
    if (accessible_name) return accessible_name;
 
-   return _elm_util_mkup_to_text(elm_object_item_text_get(item->list_item));
+   return _elm_widget_item_accessible_plain_name_get(eo_it,
+                 elm_object_item_text_get(item->list_item));
 }
 //
 

diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 401c1a0c62e61f332762e5a394c0b7e5fed9fdd3..c017b28dfea9922201d80fdc4e65b6846fa638a0 100644 (file)
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -2282,7 +2282,7 @@ _elm_multibuttonentry_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, El
    eo_do_super(eo_it, ELM_MULTIBUTTONENTRY_ITEM_CLASS, ret = elm_interface_atspi_accessible_name_get());
    if (ret) return ret;
    ret = elm_object_part_text_get(VIEW(it), "elm.btn.text");
-   return _elm_util_mkup_to_text(ret);
+   return _elm_widget_item_accessible_plain_name_get(eo_it, ret);
 }
 
 EOLIAN static Elm_Atspi_State_Set

diff --git a/src/lib/elc_naviframe.c b/src/lib/elc_naviframe.c
index bff2c61c8f0e36b426342ee397cf2b9bbb101ae0..ffba4aec8b62530dc4f657bcb380d8ca3765e5ed 100644 (file)
--- a/src/lib/elc_naviframe.c
+++ b/src/lib/elc_naviframe.c
@@ -621,7 +621,9 @@ _elm_naviframe_item_elm_widget_item_part_text_set(Eo *eo_it EINA_UNUSED,
         if (nit->title_label) strncat(buf, " ", 1);
         strncat(buf, nit->subtitle_label, sizeof(buf) - strlen(buf) - 2);
      }
-   eo_do(VIEW(it), elm_interface_atspi_accessible_name_set(_elm_util_mkup_to_text(buf)));
+   char *plain_text = _elm_util_mkup_to_text(buf);
+   eo_do(VIEW(it), elm_interface_atspi_accessible_name_set(plain_text));
+   free(plain_text);
 
    elm_layout_sizing_eval(WIDGET(nit));
 }
@@ -1410,7 +1412,10 @@ _item_new(Evas_Object *obj,
    //item base layout
    VIEW(it) = elm_layout_add(obj);
    eo_do(VIEW(it), elm_interface_atspi_accessible_role_set(ELM_ATSPI_ROLE_PAGE_TAB));
-   eo_do(VIEW(it), elm_interface_atspi_accessible_name_set(_elm_util_mkup_to_text((char*)title_label)));
+   char *plain_text = _elm_util_mkup_to_text((char*)title_label);
+   eo_do(VIEW(it), elm_interface_atspi_accessible_name_set(plain_text));
+   free(plain_text);
+
    evas_object_smart_member_add(VIEW(it), obj);
 
    if (!elm_widget_sub_object_add(obj, VIEW(it)))

diff --git a/src/lib/elc_popup.c b/src/lib/elc_popup.c
index c39b0defc82771c1212274112dbe770aab07d05c..8cb820b47a84298a4c2522ee2d889fa1636efd35 100644 (file)
--- a/src/lib/elc_popup.c
+++ b/src/lib/elc_popup.c
@@ -453,7 +453,7 @@ _access_name_set_cb(void *data, Evas_Object *obj EINA_UNUSED)
 {
    char *text = NULL;
    if (data) text = _elm_util_mkup_to_text((char*)data);
-   if (text) return strdup(text);
+   if (text) return text;
    return NULL;
 }
 
@@ -2544,7 +2544,11 @@ _elm_popup_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Popup_Data *sd)
         else if (elm_object_part_text_get(obj, "elm.text"))
              utf8_text = _elm_util_mkup_to_text(elm_object_part_text_get(obj, "elm.text"));
 
-        if (utf8_text) eina_strbuf_append_printf(buf, ", %s", utf8_text);
+        if (utf8_text)
+          {
+             eina_strbuf_append_printf(buf, ", %s", utf8_text);
+             free(utf8_text);
+          }
      }
 
    accessible_name = eina_strbuf_string_steal(buf);

diff --git a/src/lib/elm_entry.c b/src/lib/elm_entry.c
index 97aadcd59aa9109d411117bd2c6dda205096bb62..09e49bec38b3ca87e2d87c61027f77f842c280cf 100644 (file)
--- a/src/lib/elm_entry.c
+++ b/src/lib/elm_entry.c
@@ -7805,17 +7805,17 @@ _elm_entry_elm_interface_atspi_accessible_state_set_get(Eo *obj, Elm_Entry_Data
 EOLIAN static const char*
 _elm_entry_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Entry_Data *sd)
 {
-   char *name = NULL;
-   eo_do_super(obj, ELM_ENTRY_CLASS, name = (char *)elm_interface_atspi_accessible_name_get());
+   const char *name = NULL;
+   eo_do_super(obj, ELM_ENTRY_CLASS, name = elm_interface_atspi_accessible_name_get());
    if (name && strncmp("", name, 1)) return name;
 
    if (sd->password) return NULL;
 
-   name = _elm_util_mkup_to_text(elm_entry_entry_get(obj));
+   name = _elm_widget_accessible_plain_name_get(obj, elm_entry_entry_get(obj));
    if (name && strncmp("", name, 1)) return name;
 
    const char *ret = edje_object_part_text_get(sd->entry_edje, "elm.guide");
-   return _elm_util_mkup_to_text(ret);
+   return _elm_widget_accessible_plain_name_get(obj, ret);
 }
 
 //TIZEN ONLY (20160609): Added atspi action interface in entry

diff --git a/src/lib/elm_index.c b/src/lib/elm_index.c
index 2d891ad9addbb96b5fbb16cf914ef141cbc208d0..0a1528cf2d3329f50e02f9797675c4b5db526ebd 100644 (file)
--- a/src/lib/elm_index.c
+++ b/src/lib/elm_index.c
@@ -1807,9 +1807,9 @@ _elm_index_elm_interface_atspi_accessible_children_get(Eo *eo_it EINA_UNUSED, El
 }
 
 EOLIAN static const char*
-_elm_index_item_elm_interface_atspi_accessible_name_get(Eo *eo_it EINA_UNUSED, Elm_Index_Item_Data *data)
+_elm_index_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Index_Item_Data *data)
 {
-   return _elm_util_mkup_to_text(data->letter);
+   return _elm_widget_item_accessible_plain_name_get(eo_it, data->letter);
 }
 
 EOLIAN static const Elm_Atspi_Action*

diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 95562776cc7a36ff96b7f896bc54e098a866c695..58f3c1448be8c093daec752a305c703b73283905 100644 (file)
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -2194,9 +2194,9 @@ _elm_list_item_elm_interface_atspi_accessible_state_set_get(Eo *eo_it, Elm_List_
 }
 
 EOLIAN static const char*
-_elm_list_item_elm_interface_atspi_accessible_name_get(Eo *eo_it EINA_UNUSED, Elm_List_Item_Data *data)
+_elm_list_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_List_Item_Data *data)
 {
-   return _elm_util_mkup_to_text(data->label);
+   return _elm_widget_item_accessible_plain_name_get(eo_it, data->label);
 }
 
 EOLIAN static Eina_List*

diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c
index 701ba56dc9a565388cbcf74dbf67f8f063bbecaf..421608b97aa1c71e0b9138e506ba11b1c00c053d 100644 (file)
--- a/src/lib/elm_spinner.c
+++ b/src/lib/elm_spinner.c
@@ -1924,7 +1924,7 @@ _elm_spinner_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Spinner_Data *
         ret = elm_layout_text_get(obj, "elm.text");
      }
    //
-   return _elm_util_mkup_to_text(ret);
+   return _elm_widget_accessible_plain_name_get(obj, ret);
 }
 
 // A11Y Accessibility - END

diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 23e57dd1e502c8a3bbc3aa0a394907cdc5b9317b..c877cce6d84daaf49fcf817ec6b002dce89395ef 100644 (file)
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -4128,7 +4128,7 @@ _elm_toolbar_item_elm_interface_atspi_accessible_name_get(Eo *eo_item, Elm_Toolb
    const char *ret;
    eo_do_super(eo_item, ELM_TOOLBAR_ITEM_CLASS, ret = elm_interface_atspi_accessible_name_get());
    if (ret) return ret;
-   return _elm_util_mkup_to_text(item->label);
+   return _elm_widget_item_accessible_plain_name_get(eo_item, item->label);
 }
 
 EOLIAN static Elm_Atspi_State_Set

diff --git a/src/lib/elm_widget.c b/src/lib/elm_widget.c
index c6619389b51d978d72bf08606f113b41da4f7c62..3c529c0178b693dcbfc9ad8c01d422e650f340b7 100644 (file)
--- a/src/lib/elm_widget.c
+++ b/src/lib/elm_widget.c
@@ -5023,6 +5023,35 @@ _elm_widget_item_onscreen_is(Elm_Object_Item *item)
    return EINA_TRUE;
 }
 
+const char*
+_elm_widget_accessible_plain_name_get(Evas_Object *obj, const char* name)
+{
+   char *accessible_plain_name;
+
+   API_ENTRY return NULL;
+
+   accessible_plain_name = _elm_util_mkup_to_text(name);
+   eina_stringshare_del(sd->accessible_name);
+   sd->accessible_name =  eina_stringshare_add(accessible_plain_name);
+   free(accessible_plain_name);
+   return sd->accessible_name;
+}
+
+const char*
+_elm_widget_item_accessible_plain_name_get(Elm_Object_Item *item, const char* name)
+{
+   char *accessible_plain_name;
+
+   Elm_Widget_Item_Data *id = eo_data_scope_get(item, ELM_WIDGET_ITEM_CLASS);
+   if (!id) return NULL;
+
+   accessible_plain_name = _elm_util_mkup_to_text(name);
+   eina_stringshare_del(id->accessible_name);
+   id->accessible_name =  eina_stringshare_add(accessible_plain_name);
+   free(accessible_plain_name);
+   return id->accessible_name;
+}
+
 //TIZEN_ONLY(20161107): enhance elm_atspi_accessible_can_highlight_set to set can_hihglight property to its children
 EAPI Eina_Bool
 _elm_widget_item_highlightable(Elm_Object_Item *item)
@@ -6556,9 +6585,8 @@ _elm_widget_elm_interface_atspi_component_highlight_clear(Eo *obj, Elm_Widget_Sm
 //
 
 EOLIAN static const char*
-_elm_widget_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Widget_Smart_Data *_pd)
+_elm_widget_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Widget_Smart_Data *_pd)
 {
-   char *accessible_name;
    //TIZEN_ONLY(20190922): add name callback, description callback.
    const char *ret = NULL;
    eo_do_super(obj, ELM_WIDGET_CLASS, ret = elm_interface_atspi_accessible_name_get());
@@ -6586,11 +6614,7 @@ _elm_widget_elm_interface_atspi_accessible_name_get(Eo *obj EINA_UNUSED, Elm_Wid
    ret = elm_object_text_get(obj);
    if (!ret) return NULL;
 
-   accessible_name = _elm_util_mkup_to_text(ret);
-   eina_stringshare_del(_pd->accessible_name);
-   _pd->accessible_name =  eina_stringshare_add(accessible_name);
-   free(accessible_name);
-   return _pd->accessible_name;
+   return _elm_widget_accessible_plain_name_get(obj, ret);
 }
 //TIZEN_ONLY(20161111) add widget/widget_item description get/set
 EOLIAN void

diff --git a/src/lib/elm_widget.h b/src/lib/elm_widget.h
index 095d6c9b3ef00492ea3466c6827e20e290b43a47..eb381bf64fd14f87706fd5675cc1696ec7a47e41 100644 (file)
--- a/src/lib/elm_widget.h
+++ b/src/lib/elm_widget.h
@@ -888,6 +888,8 @@ EAPI void             elm_widget_tree_dump(const Evas_Object *top);
 EAPI void             elm_widget_tree_dot_dump(const Evas_Object *top, FILE *output);
 EAPI Eina_Bool        _elm_widget_onscreen_is(Evas_Object *widget);
 EAPI Eina_Bool        _elm_widget_item_onscreen_is(Elm_Object_Item *item);
+const char*           _elm_widget_accessible_plain_name_get(Evas_Object *obj, const char* name);
+const char*           _elm_widget_item_accessible_plain_name_get(Elm_Object_Item *item, const char* name);
 //TIZEN_ONLY(20161107): enhance elm_atspi_accessible_can_highlight_set to set can_hihglight property to its children
 EAPI Eina_Bool        _elm_widget_highlightable(Evas_Object *widget);
 EAPI Eina_Bool        _elm_widget_item_highlightable(Elm_Object_Item *item);

diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 87fddf8465ee534e9f9934489fad3dcda37ea4cb..e7880021d8590623e7a43ce3b2b90651ade8eb60 100644 (file)
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -7022,7 +7022,7 @@ _elm_win_elm_interface_atspi_accessible_name_get(Eo *obj, Elm_Win_Data *sd EINA_
    eo_do_super(obj, ELM_WIN_CLASS, ret = elm_interface_atspi_accessible_name_get());
    if (ret) return ret;
 
-   return _elm_util_mkup_to_text(elm_win_title_get(obj));
+   return _elm_widget_accessible_plain_name_get(obj, elm_win_title_get(obj));
 }
 
 #include "elm_win.eo.c"

diff --git a/src/mobile_lib/elc_ctxpopup.c b/src/mobile_lib/elc_ctxpopup.c
index dba3bec90013138b6929badb6a7ec900fd3a06dc..1b409202cb013dee700c6ee0340414e581713ff5 100644 (file)
--- a/src/mobile_lib/elc_ctxpopup.c
+++ b/src/mobile_lib/elc_ctxpopup.c
@@ -2680,7 +2680,7 @@ _elm_ctxpopup_item_elm_interface_atspi_accessible_name_get(Eo *eo_it, Elm_Ctxpop
         return icon_name;
      }
    else
-     return _elm_util_mkup_to_text(item->label);
+     return _elm_widget_item_accessible_plain_name_get(eo_it, item->label);
 }
 //