[ibus/f13/master] Added ibus-621795-engineproxy-segv.patch * Fixes Bug 621795 crash in ibus_object_destroy Added ibus

[Takao Fujiwara]

commit 4a7f67d71a50a836733cfd37d50bba17e80e2d56
Author: Takao Fujiwara <tfujiwar at redhat.com>
Date:   Wed Sep 15 10:23:37 2010 +0900

    Added ibus-621795-engineproxy-segv.patch
     * Fixes Bug 621795 crash in ibus_object_destroy
    Added ibus-626652-leak.patch
     * Fixes Bug 626652 - ibus memory leak with ibus_input_context_process_key_event

 ibus-621795-engineproxy-segv.patch |   27 +++++++++++++++++++++++++++
 ibus-626652-leak.patch             |   27 +++++++++++++++++++++++++++
 ibus.spec                          |   10 ++++++++++
 3 files changed, 64 insertions(+), 0 deletions(-)
---
diff --git a/ibus-621795-engineproxy-segv.patch b/ibus-621795-engineproxy-segv.patch
new file mode 100644
index 0000000..ec1a339
--- /dev/null
+++ b/ibus-621795-engineproxy-segv.patch
@@ -0,0 +1,27 @@
+From 85565b7a146e5ccbd484273b647b6195b6c08b03 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1 at gmail.com>
+Date: Thu, 2 Sep 2010 12:58:42 +0900
+Subject: [PATCH] Fix segv in bus_engine_proxy_process_key_event_reply_cb
+
+---
+ bus/engineproxy.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/bus/engineproxy.c b/bus/engineproxy.c
+index adda91c..64dda4f 100644
+--- a/bus/engineproxy.c
++++ b/bus/engineproxy.c
+@@ -564,7 +564,9 @@ bus_engine_proxy_process_key_event_reply_cb (IBusPendingCall *pending,
+             /* reply timeout */
+             IBusObject *connection;
+             connection = (IBusObject *) ibus_proxy_get_connection ((IBusProxy *)call_data->engine);
+-            ibus_object_destroy (connection);
++            if (connection) {
++                ibus_object_destroy (connection);
++            }
+         }
+         g_warning ("%s: %s", error->name, error->message);
+         ibus_error_free (error);
+-- 
+1.7.2.1
+
diff --git a/ibus-626652-leak.patch b/ibus-626652-leak.patch
new file mode 100644
index 0000000..7c48ba3
--- /dev/null
+++ b/ibus-626652-leak.patch
@@ -0,0 +1,27 @@
+From 888189eba783ac014e7c367004a70dad6f7b8ac0 Mon Sep 17 00:00:00 2001
+From: Peng Huang <shawn.p.huang at gmail.com>
+Date: Mon, 6 Sep 2010 17:17:24 +0800
+Subject: [PATCH] Fix memory leak in ibus_input_context_process_key_event by Fujiwarat
+
+---
+ src/ibusinputcontext.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/src/ibusinputcontext.c b/src/ibusinputcontext.c
+index 6755727..7359de0 100644
+--- a/src/ibusinputcontext.c
++++ b/src/ibusinputcontext.c
+@@ -775,6 +775,10 @@ _process_key_event_reply_cb (IBusPendingCall *pending,
+                        call_data->keycode,
+                        call_data->state | IBUS_FORWARD_MASK);
+     }
++
++    if (reply_message != NULL) {
++        dbus_message_unref (reply_message);
++    }
+ }
+ 
+ static void
+-- 
+1.7.2.1
+
diff --git a/ibus.spec b/ibus.spec
index 5e2861d..ba3de8a 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -16,6 +16,8 @@ URL:        http://code.google.com/p/ibus/
 Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 Source1:    xinput-ibus
 Patch0:     ibus-HEAD.patch
+Patch1:     ibus-621795-engineproxy-segv.patch
+Patch2:     ibus-626652-leak.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -106,6 +108,8 @@ The ibus-devel-docs package contains developer documentation for ibus
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .segv
+%patch2 -p1 -b .leak
 
 %build
 %configure \
@@ -227,6 +231,12 @@ fi
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Wed Sep 15 2010 Takao Fujiwara <tfujiwar at redhat.com> - 1.3.6-2
+- Added ibus-621795-engineproxy-segv.patch
+  Fixes Bug 621795 crash in ibus_object_destroy
+- Added ibus-626652-leak.patch
+  Fixes Bug 626652 - ibus memory leak with ibus_input_context_process_key_event
+
 * Tue Jul 06 2010 Takao Fujiwara <takao.fujiwara1 at gmail.com> - 1.3.6-1
 - Update to 1.3.6