From f2091ab7bed519f1e54c0fef7cebda21b64cfd89 Mon Sep 17 00:00:00 2001 From: Miguel de Icaza Date: Thu, 31 Dec 1998 04:43:36 +0000 Subject: [PATCH] Fix memory leak. gdk_event_put would make a copy of next_event, and 1998-12-30 Miguel de Icaza * gtk/gtkmain.c (gtk_main_do_event): Fix memory leak. gdk_event_put would make a copy of next_event, and next_event was not being freed. --- ChangeLog | 8 +++++++- ChangeLog.pre-2-0 | 8 +++++++- ChangeLog.pre-2-10 | 8 +++++++- ChangeLog.pre-2-2 | 8 +++++++- ChangeLog.pre-2-4 | 8 +++++++- ChangeLog.pre-2-6 | 8 +++++++- ChangeLog.pre-2-8 | 8 +++++++- gtk/gtkmain.c | 7 +++++-- 8 files changed, 54 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 884a8ff4b4..1e38d762ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1998-12-30 Miguel de Icaza + + * gtk/gtkmain.c (gtk_main_do_event): Fix memory leak. + gdk_event_put would make a copy of next_event, and next_event was + not being freed. + Wed Dec 30 18:39:21 CST 1998 Shawn T. Amundson * Released GTK+ 1.1.11 @@ -9,7 +15,7 @@ Wed Dec 30 18:39:21 CST 1998 Shawn T. Amundson gtk+.spec: docs/gtk-config.1: gtk/gtkfeatures.h.in: version=1.1.11 - + 1998-12-29 Owen Taylor * gdk/gdkim.c (gdk_wcstombs): Fixed off-by-one diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 884a8ff4b4..1e38d762ab 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +1998-12-30 Miguel de Icaza + + * gtk/gtkmain.c (gtk_main_do_event): Fix memory leak. + gdk_event_put would make a copy of next_event, and next_event was + not being freed. + Wed Dec 30 18:39:21 CST 1998 Shawn T. Amundson * Released GTK+ 1.1.11 @@ -9,7 +15,7 @@ Wed Dec 30 18:39:21 CST 1998 Shawn T. Amundson gtk+.spec: docs/gtk-config.1: gtk/gtkfeatures.h.in: version=1.1.11 - + 1998-12-29 Owen Taylor * gdk/gdkim.c (gdk_wcstombs): Fixed off-by-one diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 884a8ff4b4..1e38d762ab 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +1998-12-30 Miguel de Icaza + + * gtk/gtkmain.c (gtk_main_do_event): Fix memory leak. + gdk_event_put would make a copy of next_event, and next_event was + not being freed. + Wed Dec 30 18:39:21 CST 1998 Shawn T. Amundson * Released GTK+ 1.1.11 @@ -9,7 +15,7 @@ Wed Dec 30 18:39:21 CST 1998 Shawn T. Amundson gtk+.spec: docs/gtk-config.1: gtk/gtkfeatures.h.in: version=1.1.11 - + 1998-12-29 Owen Taylor * gdk/gdkim.c (gdk_wcstombs): Fixed off-by-one diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 884a8ff4b4..1e38d762ab 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +1998-12-30 Miguel de Icaza + + * gtk/gtkmain.c (gtk_main_do_event): Fix memory leak. + gdk_event_put would make a copy of next_event, and next_event was + not being freed. + Wed Dec 30 18:39:21 CST 1998 Shawn T. Amundson * Released GTK+ 1.1.11 @@ -9,7 +15,7 @@ Wed Dec 30 18:39:21 CST 1998 Shawn T. Amundson gtk+.spec: docs/gtk-config.1: gtk/gtkfeatures.h.in: version=1.1.11 - + 1998-12-29 Owen Taylor * gdk/gdkim.c (gdk_wcstombs): Fixed off-by-one diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 884a8ff4b4..1e38d762ab 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +1998-12-30 Miguel de Icaza + + * gtk/gtkmain.c (gtk_main_do_event): Fix memory leak. + gdk_event_put would make a copy of next_event, and next_event was + not being freed. + Wed Dec 30 18:39:21 CST 1998 Shawn T. Amundson * Released GTK+ 1.1.11 @@ -9,7 +15,7 @@ Wed Dec 30 18:39:21 CST 1998 Shawn T. Amundson gtk+.spec: docs/gtk-config.1: gtk/gtkfeatures.h.in: version=1.1.11 - + 1998-12-29 Owen Taylor * gdk/gdkim.c (gdk_wcstombs): Fixed off-by-one diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 884a8ff4b4..1e38d762ab 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +1998-12-30 Miguel de Icaza + + * gtk/gtkmain.c (gtk_main_do_event): Fix memory leak. + gdk_event_put would make a copy of next_event, and next_event was + not being freed. + Wed Dec 30 18:39:21 CST 1998 Shawn T. Amundson * Released GTK+ 1.1.11 @@ -9,7 +15,7 @@ Wed Dec 30 18:39:21 CST 1998 Shawn T. Amundson gtk+.spec: docs/gtk-config.1: gtk/gtkfeatures.h.in: version=1.1.11 - + 1998-12-29 Owen Taylor * gdk/gdkim.c (gdk_wcstombs): Fixed off-by-one diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 884a8ff4b4..1e38d762ab 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +1998-12-30 Miguel de Icaza + + * gtk/gtkmain.c (gtk_main_do_event): Fix memory leak. + gdk_event_put would make a copy of next_event, and next_event was + not being freed. + Wed Dec 30 18:39:21 CST 1998 Shawn T. Amundson * Released GTK+ 1.1.11 @@ -9,7 +15,7 @@ Wed Dec 30 18:39:21 CST 1998 Shawn T. Amundson gtk+.spec: docs/gtk-config.1: gtk/gtkfeatures.h.in: version=1.1.11 - + 1998-12-29 Owen Taylor * gdk/gdkim.c (gdk_wcstombs): Fixed off-by-one diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 4429614456..468e183647 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -581,8 +581,11 @@ gtk_main_do_event (GdkEvent *event) if (next_event) - gdk_event_put (next_event); - next_event = NULL; + { + gdk_event_put (next_event); + gdk_event_free (next_event); + next_event = NULL; + } /* Find the widget which got the event. We store the widget * in the user_data field of GdkWindow's.