ecore_imf: fix crash when ecore_imf_context_del is called in ecore_imf_context_input_panel_callback_call

3 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 540922d8ff..a8d459b90e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2013-05-14  Jihoon Kim
 
         * Edje entry: return surrounding string until the start position of selection
+        * ecore_imf: fix crash when ecore_imf_context_del is called in ecore_imf_context_input_panel_callback_call
 
 2013-05-13  Thiep Ha
 
diff --git a/NEWS b/NEWS
index 3a623aecd1..6d6c10894e 100644
--- a/NEWS
+++ b/NEWS
@@ -269,3 +269,4 @@ Fixes:
     * Evas text: Fixed line size calculation when using multiple fonts.
     * Evas: Fix crash if app use native surface in wrong engine.
     * Edje entry: return surrounding string until the start position of selection
+    * Ecore-imf: fix crash when ecore_imf_context_del is called in ecore_imf_context_input_panel_callback_call
diff --git a/src/lib/ecore_imf/ecore_imf_context.c b/src/lib/ecore_imf/ecore_imf_context.c
index f1e88211c7..de9b9e9001 100644
--- a/src/lib/ecore_imf/ecore_imf_context.c
+++ b/src/lib/ecore_imf/ecore_imf_context.c
@@ -1137,6 +1137,9 @@ ecore_imf_context_input_panel_event_callback_call(Ecore_IMF_Context *ctx, Ecore_
                  value == ECORE_IMF_INPUT_PANEL_STATE_HIDE &&
                  show_req_ctx == ctx)
                show_req_ctx = NULL;
+
+             if (!ECORE_MAGIC_CHECK(ctx, ECORE_MAGIC_CONTEXT))
+               break;
           }
      }
 }