[EGIT] [core/enlightenment] enlightenment-0.19 06/23: e - ibar - fix clash when 2 icons of the same path get added somehow

[Carsten Haitzler]

discomfitor pushed a commit to branch enlightenment-0.19.

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

commit e311bc2372be0a362b4a2fc7c671b4a34f8d3b26
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Sat Oct 24 11:01:56 2015 +0900

    e - ibar - fix clash when 2 icons of the same path get added somehow
    
    i encontered a situation where the icon_hash contained a garbage entry
    - had been freed already. the only way i can see this happening is if
    the desktop file changed path during runtime thus the icon was never
    removed from hash on free as string didnt match. store string used
    when adding to hash so removal is guarannteed to work and also for
    good measure protect against double-adding (and generate a new string
    for storage using timestamp which should be unique).
    
    so this fixes a crash i was just looping on.
    
    @fix
---
 src/modules/ibar/e_mod_main.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/modules/ibar/e_mod_main.c b/src/modules/ibar/e_mod_main.c
index 36cf5a3..c47820e 100644
--- a/src/modules/ibar/e_mod_main.c
+++ b/src/modules/ibar/e_mod_main.c
@@ -78,6 +78,7 @@ struct _IBar_Icon
    Eina_List       *exes; //all instances
    Eina_List       *menu_pending; //clients with menu items pending
    E_Gadcon_Popup  *menu;
+   const char      *hashname;
    int              mouse_down;
    struct
    {
@@ -859,7 +860,17 @@ _ibar_icon_new(IBar *b, Efreet_Desktop *desktop, Eina_Bool 
notinorder)
 
    _ibar_icon_fill(ic);
    b->icons = eina_inlist_append(b->icons, EINA_INLIST_GET(ic));
-   eina_hash_add(b->icon_hash, _desktop_name_get(ic->app), ic);
+   if (eina_hash_find(b->icon_hash, _desktop_name_get(ic->app)))
+     {
+        char buf[PATH_MAX];
+
+        ERR("Ibar - Unexpected: icon with same desktop path created twice");
+        snprintf(buf, sizeof(buf), "%s::%1.20f",
+                 _desktop_name_get(ic->app), ecore_time_get());
+        ic->hashname = eina_stringshare_add(buf);
+     }
+   else ic->hashname = eina_stringshare_add(_desktop_name_get(ic->app));
+   eina_hash_add(b->icon_hash, ic->hashname, ic);
    if (notinorder)
      {
         ic->not_in_order = 1;
@@ -908,7 +919,8 @@ _ibar_icon_free(IBar_Icon *ic)
    E_FREE_FUNC(ic->hide_timer, ecore_timer_del);
    E_FREE_FUNC(ic->show_timer, ecore_timer_del);
    ic->ibar->icons = eina_inlist_remove(ic->ibar->icons, EINA_INLIST_GET(ic));
-   eina_hash_del_by_key(ic->ibar->icon_hash, _desktop_name_get(ic->app));
+   eina_hash_del_by_key(ic->ibar->icon_hash, ic->hashname);
+   E_FREE_FUNC(ic->hashname, eina_stringshare_del);
    E_FREE_FUNC(ic->reset_timer, ecore_timer_del);
    if (ic->app) efreet_desktop_unref(ic->app);
    evas_object_event_callback_del_full(ic->o_holder, EVAS_CALLBACK_MOUSE_IN,

--