Attachment 618516 Details for Bug 859879 – Patch for gtkimmulticontext.c

[patch] Patch for gtkimmulticontext.c

gtk+-859879-segv-im-ibus.patch (text/plain), 1.37 KB, created by fujiwara on 2012-09-28 10:47:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: fujiwara

Created: 2012-09-28 10:47:13 UTC

Size: 1.37 KB

patch

obsolete

>From 5cd48113862cf3890360d20ccb3df9af355b53b4 Mon Sep 17 00:00:00 2001
>From: Takao Fujiwara <tfujiwar@redhat.com>
>Date: Fri, 28 Sep 2012 19:29:58 +0900
>Subject: [PATCH] Do not call unref in gtk_im_multicontext_get_slave.
>
>If unref is called for GtkIMContext when the context_id and
>get_effective_context_id() are different, it can calls
>the finalize function while the object is still used.
>
>https://bugzilla.redhat.com/show_bug.cgi?id=859879
>---
> gtk/gtkimmulticontext.c |   11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
>diff --git a/gtk/gtkimmulticontext.c b/gtk/gtkimmulticontext.c
>index 712d5ca..d5c389b 100644
>--- a/gtk/gtkimmulticontext.c
>+++ b/gtk/gtkimmulticontext.c
>@@ -265,8 +265,15 @@ gtk_im_multicontext_get_slave (GtkIMMulticontext *multicontext)
> {
>   GtkIMMulticontextPrivate *priv = multicontext->priv;
> 
>-  if (g_strcmp0 (priv->context_id, get_effective_context_id (multicontext)) != 0)
>-    gtk_im_multicontext_set_slave (multicontext, NULL, FALSE);
>+  if (g_strcmp0 (priv->context_id, get_effective_context_id (multicontext)) != 0) {
>+    /* There is a timing issue to get the different values between
>+     * priv->context_id and _gtk_im_module_get_default_context_id().
>+     * priv->slave should not be unref since the priv->slave is still used.
>+     */
>+    if (priv->slave) {
>+        return NULL;
>+    }
>+  }
> 
>   if (!priv->slave)
>     {
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 859879: 617482 | 618516 | 619736 | 620096