From 60207c37621eb8670aff6817a0c90dd24fd7bc60 Mon Sep 17 00:00:00 2001 From: Hidetoshi Tajima Date: Tue, 26 Nov 2002 22:13:50 +0000 Subject: [PATCH] Fix #99593: Fix a memory leak when XmbLookupString returns XBufferOverflow * modules/input/gtkimcontextxim.c (gtk_im_context_xim_filter_keypress): Fix #99593: Fix a memory leak when XmbLookupString returns XBufferOverflow --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ modules/input/gtkimcontextxim.c | 5 +++++ 7 files changed, 47 insertions(+) diff --git a/ChangeLog b/ChangeLog index 7b11051443..2c330cf2a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Nov 26 13:07:56 2002 HideToshi Tajima + + * modules/input/gtkimcontextxim.c + (gtk_im_context_xim_filter_keypress): + Fix #99593: Fix a memory leak when XmbLookupString returns + XBufferOverflow + 2002-11-26 Daniel Elstner * gtk/gtktoolbar.c (elide_underscores): Fix nasty typo (#99653): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7b11051443..2c330cf2a7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Tue Nov 26 13:07:56 2002 HideToshi Tajima + + * modules/input/gtkimcontextxim.c + (gtk_im_context_xim_filter_keypress): + Fix #99593: Fix a memory leak when XmbLookupString returns + XBufferOverflow + 2002-11-26 Daniel Elstner * gtk/gtktoolbar.c (elide_underscores): Fix nasty typo (#99653): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7b11051443..2c330cf2a7 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Tue Nov 26 13:07:56 2002 HideToshi Tajima + + * modules/input/gtkimcontextxim.c + (gtk_im_context_xim_filter_keypress): + Fix #99593: Fix a memory leak when XmbLookupString returns + XBufferOverflow + 2002-11-26 Daniel Elstner * gtk/gtktoolbar.c (elide_underscores): Fix nasty typo (#99653): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7b11051443..2c330cf2a7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Tue Nov 26 13:07:56 2002 HideToshi Tajima + + * modules/input/gtkimcontextxim.c + (gtk_im_context_xim_filter_keypress): + Fix #99593: Fix a memory leak when XmbLookupString returns + XBufferOverflow + 2002-11-26 Daniel Elstner * gtk/gtktoolbar.c (elide_underscores): Fix nasty typo (#99653): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7b11051443..2c330cf2a7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Tue Nov 26 13:07:56 2002 HideToshi Tajima + + * modules/input/gtkimcontextxim.c + (gtk_im_context_xim_filter_keypress): + Fix #99593: Fix a memory leak when XmbLookupString returns + XBufferOverflow + 2002-11-26 Daniel Elstner * gtk/gtktoolbar.c (elide_underscores): Fix nasty typo (#99653): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7b11051443..2c330cf2a7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Tue Nov 26 13:07:56 2002 HideToshi Tajima + + * modules/input/gtkimcontextxim.c + (gtk_im_context_xim_filter_keypress): + Fix #99593: Fix a memory leak when XmbLookupString returns + XBufferOverflow + 2002-11-26 Daniel Elstner * gtk/gtktoolbar.c (elide_underscores): Fix nasty typo (#99653): diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c index 5b76f8357e..680a6396a9 100644 --- a/modules/input/gtkimcontextxim.c +++ b/modules/input/gtkimcontextxim.c @@ -560,6 +560,8 @@ gtk_im_context_xim_filter_keypress (GtkIMContext *context, if (status == XBufferOverflow) { buffer_size = num_bytes; + if (buffer != static_buffer) + g_free (buffer); buffer = g_malloc (num_bytes + 1); goto again; } @@ -590,6 +592,9 @@ gtk_im_context_xim_filter_keypress (GtkIMContext *context, } } + if (buffer != static_buffer) + g_free (buffer); + return result; }