From 5206f63c4d8e274d4165df3160b8c566f6240664 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Wed, 15 Nov 2023 19:54:05 +0900 Subject: [PATCH] Call strdup() after g_return_if_fail() in im-ibus.so --- ibus-HEAD.patch | 33 +++++++++++++++++++++++++++++++++ ibus.spec | 5 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch index 4f8febb..4481854 100644 --- a/ibus-HEAD.patch +++ b/ibus-HEAD.patch @@ -1207,3 +1207,36 @@ index fe4cab45..10190921 100644 -- 2.41.0 +From 1be3e2f79b384a374b2a69a31c88a4f36e1dd868 Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Wed, 15 Nov 2023 17:19:02 +0900 +Subject: [PATCH] client/gtk2: Call strdup() after g_return_if_fail() + +--- + client/gtk2/ibusimcontext.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/client/gtk2/ibusimcontext.c b/client/gtk2/ibusimcontext.c +index b5a44da0..cfc08c20 100644 +--- a/client/gtk2/ibusimcontext.c ++++ b/client/gtk2/ibusimcontext.c +@@ -2417,7 +2417,7 @@ _create_input_context_done (IBusBus *bus, + static void + _create_input_context (IBusIMContext *ibusimcontext) + { +- gchar *prgname = g_strdup (g_get_prgname()); ++ gchar *prgname; + gchar *client_name; + IDEBUG ("%s", __FUNCTION__); + +@@ -2425,6 +2425,7 @@ _create_input_context (IBusIMContext *ibusimcontext) + + g_return_if_fail (ibusimcontext->cancellable == NULL); + ++ prgname = g_strdup (g_get_prgname()); + ibusimcontext->cancellable = g_cancellable_new (); + + if (!prgname) +-- +2.41.0 + diff --git a/ibus.spec b/ibus.spec index 3b0d886..cd7dbb5 100644 --- a/ibus.spec +++ b/ibus.spec @@ -58,7 +58,7 @@ Name: ibus Version: 1.5.29~rc2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Intelligent Input Bus for Linux OS License: LGPL-2.1-or-later URL: https://github.com/ibus/%name/wiki @@ -580,6 +580,9 @@ dconf update || : %{_datadir}/installed-tests/ibus %changelog +* Wed Nov 15 2023 Takao Fujiwara - 1.5.29~rc2-2 +- Call strdup() after g_return_if_fail() in im-ibus.so + * Thu Nov 09 2023 Takao Fujiwara - 1.5.29~rc2-1 - Bump to 1.5.29-rc2