From 9f31414e9944295fea869552db009918c431c4f7 Mon Sep 17 00:00:00 2001 From: raster Date: Thu, 27 Sep 2012 11:11:52 +0000 Subject: [PATCH] backport imf ibus module fix. git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/branches/ecore-1.7@77152 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- ChangeLog | 6 ++++++ NEWS | 3 ++- src/modules/immodules/ibus/ibus_imcontext.c | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9db1969..5fc5852 100644 --- a/ChangeLog +++ b/ChangeLog @@ -947,3 +947,9 @@ 2012-09-21 Christopher Michael * Fix ecore_x_randr to properly return output modes from ecore_x_randr_output_modes_get + +2012-09-27 Carsten Haitzler (The Rasterman) + + * Fix ecore_imf buf in the ibus module where it may segv + accessing a wrong context handle. + diff --git a/NEWS b/NEWS index 7d5e5db..79e57cf 100644 --- a/NEWS +++ b/NEWS @@ -7,7 +7,8 @@ Fixes: * ecore_evas rotation handling on some driver implementations * ecore_file_escape_name() escape taba nd newline right. * ecore_x_image_is_argb32_get() returns correctly given endianness. - + * ecore_imf ibus module potential segv fixed. + Changes since Ecore 1.2.0: -------------------------- diff --git a/src/modules/immodules/ibus/ibus_imcontext.c b/src/modules/immodules/ibus/ibus_imcontext.c index 2c2e180..23bf033 100644 --- a/src/modules/immodules/ibus/ibus_imcontext.c +++ b/src/modules/immodules/ibus/ibus_imcontext.c @@ -257,6 +257,8 @@ ibus_im_context_del(Ecore_IMF_Context *ctx) // release preedit if (ibusimcontext->preedit_string) free(ibusimcontext->preedit_string); + if (_focus_im_context == ctx) + _focus_im_context = NULL; } EAPI Eina_Bool -- 2.7.4