[rpms/ibus] autotool: Fix to allocate compose output buffer with more than two chars

[rpms/ibus] autotool: Fix to allocate compose output buffer with more than two chars

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : d2b4f54f21fabf24ba20a0c88a182ada258e1e60
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2019-10-04T20:50:15+09:00
Stats  : +34/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/d2b4f54f21fabf24ba20a0c88a182ada258e1e60?branch=autotool

Log:
Fix to allocate compose output buffer with more than two chars

---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index b7b0fa1..6faa10f 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -173,3 +173,33 @@ index 3a626230..2439de14 100644
 -- 
 2.21.0
 
+From 773420fad23078ceef83e8ae84bba4e139d0bea3 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Thu, 19 Sep 2019 17:09:46 +0900
+Subject: [PATCH] src: Fix to allocate compose output buffer with more than two
+ chars
+
+If the compose output chars are more than two, IBusCompose calls
+g_renew() but the size is not enough to insert '\0'.
+
+BUG=https://github.com/ibus/ibus/issues/2123
+---
+ src/ibuscomposetable.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ibuscomposetable.c b/src/ibuscomposetable.c
+index 5fd37f10..dd9d31d4 100644
+--- a/src/ibuscomposetable.c
++++ b/src/ibuscomposetable.c
+@@ -148,7 +148,7 @@ parse_compose_value (IBusComposeData  *compose_data,
+             } else {
+                 compose_data->values = g_renew (gunichar,
+                                                 compose_data->values,
+-                                                n_uchars + 1);
++                                                n_uchars + 2);
+             }
+             compose_data->values[n_uchars++] = *up;
+         }
+-- 
+2.21.0
+

diff --git a/ibus.spec b/ibus.spec
index bd3a7bb..495d956 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -35,7 +35,7 @@
 
 Name:           ibus
 Version:        1.5.21
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPLv2+
 URL:            https://github.com/ibus/%name/wiki
@@ -461,6 +461,9 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Fri Oct 04 2019 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.21-3
+- Fix to allocate compose output buffer with more than two chars
+
 * Fri Sep 13 2019 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.21-2
 - Fix #1751940 - CVE-2019-14822 GDBusServer peer authorization