elementary : Backport 83121.

SVN revision: 83123

diff --git a/ChangeLog b/ChangeLog
index 6694d9aca9d5286f9c1b7e29c32ab4fea812026f..4fc8846c262ddaaddcc69bf02ef24cef135834e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -728,3 +728,6 @@
 
         * Fix memory leak of the ctxpopup and callback function to be a ctxpoup obj is delivered to.
 
+2013-01-23  WooHyun Jung
+
+        * In _timer_cb of elm_notify, access to sd should be forbidden after smart_callback_call is called.

diff --git a/NEWS b/NEWS
index b6f15725a12270a1503a3ce71ad5f79edcddd057..91a07a0c33d4db54643a689d49e7103aa8330f31 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Fixes:
    * when parent of ctxpopup is resized, ctxpopup calls dismissed signal.
    * When string in entry is changed, access to sd should be forbidden after smart_callback_call is called.
    * Fix memory leak of the ctxpopup and callback function to be ctxpopup obj is delivered to.
+   * In _timer_cb of elm_notify, access to sd should be forbidden after smart_callback_call is called.
 
 
 Elementary 1.7.5

diff --git a/src/lib/elm_notify.c b/src/lib/elm_notify.c
index 7caabe6b5a85d5c7ef528307f3657d5fd926feed..314cb53a75035cf1061d8f68d084dcdb49d38cd6 100644 (file)
--- a/src/lib/elm_notify.c
+++ b/src/lib/elm_notify.c
@@ -356,13 +356,13 @@ _timer_cb(void *data)
 
    ELM_NOTIFY_DATA_GET(obj, sd);
 
+   sd->timer = NULL;
    if (!evas_object_visible_get(obj)) goto end;
 
    evas_object_hide(obj);
    evas_object_smart_callback_call(obj, SIG_TIMEOUT, NULL);
 
 end:
-   sd->timer = NULL;
    return ECORE_CALLBACK_CANCEL;
 }