From 6f9b92150f1c5f52af626ba445f2e2fab4cd1174 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 27 Nov 2003 23:27:40 +0000 Subject: [PATCH] Don't use freed memory. (#127698, Taavi Talvik) Fri Nov 28 00:26:24 2003 Matthias Clasen * gtk/gtkfilesystemmodel.c (gtk_file_system_model_finalize): Don't use freed memory. (#127698, Taavi Talvik) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkfilesystemmodel.c | 5 +++-- 6 files changed, 28 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 75e5c12b87..9d498451dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Nov 28 00:26:24 2003 Matthias Clasen + + * gtk/gtkfilesystemmodel.c (gtk_file_system_model_finalize): + Don't use freed memory. (#127698, Taavi Talvik) + Fri Nov 28 00:09:10 2003 Matthias Clasen * gtk/gtkfilechooserentry.c: Remove debug g_print()s. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 75e5c12b87..9d498451dc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Fri Nov 28 00:26:24 2003 Matthias Clasen + + * gtk/gtkfilesystemmodel.c (gtk_file_system_model_finalize): + Don't use freed memory. (#127698, Taavi Talvik) + Fri Nov 28 00:09:10 2003 Matthias Clasen * gtk/gtkfilechooserentry.c: Remove debug g_print()s. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 75e5c12b87..9d498451dc 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Fri Nov 28 00:26:24 2003 Matthias Clasen + + * gtk/gtkfilesystemmodel.c (gtk_file_system_model_finalize): + Don't use freed memory. (#127698, Taavi Talvik) + Fri Nov 28 00:09:10 2003 Matthias Clasen * gtk/gtkfilechooserentry.c: Remove debug g_print()s. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 75e5c12b87..9d498451dc 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Fri Nov 28 00:26:24 2003 Matthias Clasen + + * gtk/gtkfilesystemmodel.c (gtk_file_system_model_finalize): + Don't use freed memory. (#127698, Taavi Talvik) + Fri Nov 28 00:09:10 2003 Matthias Clasen * gtk/gtkfilechooserentry.c: Remove debug g_print()s. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 75e5c12b87..9d498451dc 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Fri Nov 28 00:26:24 2003 Matthias Clasen + + * gtk/gtkfilesystemmodel.c (gtk_file_system_model_finalize): + Don't use freed memory. (#127698, Taavi Talvik) + Fri Nov 28 00:09:10 2003 Matthias Clasen * gtk/gtkfilechooserentry.c: Remove debug g_print()s. diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c index f082e93666..184f9d4378 100644 --- a/gtk/gtkfilesystemmodel.c +++ b/gtk/gtkfilesystemmodel.c @@ -247,7 +247,7 @@ static void gtk_file_system_model_finalize (GObject *object) { GtkFileSystemModel *model = GTK_FILE_SYSTEM_MODEL (object); - FileModelNode *children; + FileModelNode *children, *next; if (model->root_folder) g_object_unref (model->root_folder); @@ -255,8 +255,9 @@ gtk_file_system_model_finalize (GObject *object) children = model->roots; while (children) { + next = children->next; file_model_node_free (children); - children = children->next; + children = next; } }