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

diff --git a/ChangeLog b/ChangeLog
index 7b110514433b032e469e2ee3b429054ab4fab073..2c330cf2a775ba530699175bb6520797feb99b7c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Nov 26 13:07:56 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * 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  <daniel.elstner@gmx.net>
 
        * gtk/gtktoolbar.c (elide_underscores): Fix nasty typo (#99653):

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7b110514433b032e469e2ee3b429054ab4fab073..2c330cf2a775ba530699175bb6520797feb99b7c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Tue Nov 26 13:07:56 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * 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  <daniel.elstner@gmx.net>
 
        * gtk/gtktoolbar.c (elide_underscores): Fix nasty typo (#99653):

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 7b110514433b032e469e2ee3b429054ab4fab073..2c330cf2a775ba530699175bb6520797feb99b7c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Tue Nov 26 13:07:56 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * 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  <daniel.elstner@gmx.net>
 
        * gtk/gtktoolbar.c (elide_underscores): Fix nasty typo (#99653):

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7b110514433b032e469e2ee3b429054ab4fab073..2c330cf2a775ba530699175bb6520797feb99b7c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Tue Nov 26 13:07:56 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * 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  <daniel.elstner@gmx.net>
 
        * gtk/gtktoolbar.c (elide_underscores): Fix nasty typo (#99653):

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7b110514433b032e469e2ee3b429054ab4fab073..2c330cf2a775ba530699175bb6520797feb99b7c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Tue Nov 26 13:07:56 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * 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  <daniel.elstner@gmx.net>
 
        * gtk/gtktoolbar.c (elide_underscores): Fix nasty typo (#99653):

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7b110514433b032e469e2ee3b429054ab4fab073..2c330cf2a775ba530699175bb6520797feb99b7c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Tue Nov 26 13:07:56 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
+
+       * 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  <daniel.elstner@gmx.net>
 
        * gtk/gtktoolbar.c (elide_underscores): Fix nasty typo (#99653):

diff --git a/modules/input/gtkimcontextxim.c b/modules/input/gtkimcontextxim.c
index 5b76f8357eea8d40d52e8fbc4a4121e5067b7727..680a6396a9d92db07527516910a6739596117981 100644 (file)
--- 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;
 }