From: ChunEon Park <chuneon.park@samsung.com>

Subject: Re: [E-devel] some bug fix patches

Fix lurking free bug in grab code.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@56576 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/ChangeLog b/ChangeLog
index 4f38582..2b71e0a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,3 @@
-2011-01-31  Carsten Haitzler,,,  <Please set CHANGE_LOG_EMAIL_ADDRESS or EMAIL_ADDRESS environment variable>
-
-       reviewed by: <delete if not using a buddy>
-       patch by: <delete if not someone else's patch>
-
-       * src/lib/canvas/evas_key_grab.c:
-
 2011-01-29  Carsten Haitzler (The Rasterman)
 
         1.0.0 release
@@ -34,3 +27,8 @@
         * More code cleanups will be coming in the future. This shipment is
           mostly to get code review started (and also make sure I don't have a
           merging hell later on).
+
+2011-01-31  ChunEon Park
+
+       * Fix lurking free bug in key grabs.
+

diff --git a/src/lib/canvas/evas_key_grab.c b/src/lib/canvas/evas_key_grab.c
index a8e8979..5152842 100644 (file)
--- a/src/lib/canvas/evas_key_grab.c
+++ b/src/lib/canvas/evas_key_grab.c
@@ -48,8 +48,8 @@ evas_key_grab_new(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modi
        if (eina_error_get())
          {
             MERR_FATAL();
-            free(g);
             free(g->keyname);
+            free(g);
             return NULL;
          }
      }
@@ -63,8 +63,8 @@ evas_key_grab_new(Evas_Object *obj, const char *keyname, Evas_Modifier_Mask modi
          {
             MERR_FATAL();
             g->object->grabs = eina_list_remove(g->object->grabs, g);
-            free(g);
             free(g->keyname);
+            free(g);
             return NULL;
          }
      }