From 3f14b4598f70cb477a80e662954b826d6267dcbf Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 22 Aug 2000 16:34:43 +0000 Subject: [PATCH] Fix double free of font desc. Tue Aug 22 12:33:24 2000 Owen Taylor * gtk/testgtk.c (create_styles): Fix double free of font desc. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/testgtk.c | 2 -- tests/testgtk.c | 2 -- 9 files changed, 35 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4d6fe9c5b..c99a2fd65b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Aug 22 12:33:24 2000 Owen Taylor + + * gtk/testgtk.c (create_styles): Fix double free of + font desc. + Mon Aug 21 22:39:18 2000 Owen Taylor * gtk/gtkwidget.[ch]: Add gtk_widget_modify_{fg,bg,text,base,font}. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c4d6fe9c5b..c99a2fd65b 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Tue Aug 22 12:33:24 2000 Owen Taylor + + * gtk/testgtk.c (create_styles): Fix double free of + font desc. + Mon Aug 21 22:39:18 2000 Owen Taylor * gtk/gtkwidget.[ch]: Add gtk_widget_modify_{fg,bg,text,base,font}. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c4d6fe9c5b..c99a2fd65b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Aug 22 12:33:24 2000 Owen Taylor + + * gtk/testgtk.c (create_styles): Fix double free of + font desc. + Mon Aug 21 22:39:18 2000 Owen Taylor * gtk/gtkwidget.[ch]: Add gtk_widget_modify_{fg,bg,text,base,font}. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c4d6fe9c5b..c99a2fd65b 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Tue Aug 22 12:33:24 2000 Owen Taylor + + * gtk/testgtk.c (create_styles): Fix double free of + font desc. + Mon Aug 21 22:39:18 2000 Owen Taylor * gtk/gtkwidget.[ch]: Add gtk_widget_modify_{fg,bg,text,base,font}. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c4d6fe9c5b..c99a2fd65b 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Aug 22 12:33:24 2000 Owen Taylor + + * gtk/testgtk.c (create_styles): Fix double free of + font desc. + Mon Aug 21 22:39:18 2000 Owen Taylor * gtk/gtkwidget.[ch]: Add gtk_widget_modify_{fg,bg,text,base,font}. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c4d6fe9c5b..c99a2fd65b 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Aug 22 12:33:24 2000 Owen Taylor + + * gtk/testgtk.c (create_styles): Fix double free of + font desc. + Mon Aug 21 22:39:18 2000 Owen Taylor * gtk/gtkwidget.[ch]: Add gtk_widget_modify_{fg,bg,text,base,font}. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c4d6fe9c5b..c99a2fd65b 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Aug 22 12:33:24 2000 Owen Taylor + + * gtk/testgtk.c (create_styles): Fix double free of + font desc. + Mon Aug 21 22:39:18 2000 Owen Taylor * gtk/gtkwidget.[ch]: Add gtk_widget_modify_{fg,bg,text,base,font}. diff --git a/gtk/testgtk.c b/gtk/testgtk.c index 0f01ddf714..eb58685e24 100644 --- a/gtk/testgtk.c +++ b/gtk/testgtk.c @@ -8581,8 +8581,6 @@ create_styles (void) g_object_unref (G_OBJECT (rc_style)); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - - pango_font_description_free (font_desc); } if (!GTK_WIDGET_VISIBLE (window)) diff --git a/tests/testgtk.c b/tests/testgtk.c index 0f01ddf714..eb58685e24 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -8581,8 +8581,6 @@ create_styles (void) g_object_unref (G_OBJECT (rc_style)); gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0); - - pango_font_description_free (font_desc); } if (!GTK_WIDGET_VISIBLE (window))