From: Ben Pfaff <blp@gnu.org>
Date: Wed, 7 May 2008 00:09:00 +0000 (+0000)
Subject: (gtk_sheet_dispose): Set the sheet's entry_container and button
X-Git-Tag: v0.6.0~24
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7f7bd52a51eb1784e31ea2cf2bf6601759d11f8;p=pspp-builds.git

(gtk_sheet_dispose): Set the sheet's entry_container and button
members to NULL after unref'ing them, so that a later call to
gtk_sheet_for_all will not try to dereference a dangling pointer.
---

diff --git a/lib/gtksheet/ChangeLog b/lib/gtksheet/ChangeLog
index 8e922979..910c15d9 100644
--- a/lib/gtksheet/ChangeLog
+++ b/lib/gtksheet/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-06  Ben Pfaff  <blp@gnu.org>
+
+	* gtksheet.c (gtk_sheet_dispose): Set the sheet's entry_container
+	and button members to NULL after unref'ing them, so that a later
+	call to gtk_sheet_for_all will not try to dereference a dangling
+	pointer.
+
 2008-03-06 John Darrington <john@darrington.wattle.id.au>
 
 	* gsheet-row-iface.c gsheet-row-iface.h: Delete unused, unneccesary
diff --git a/lib/gtksheet/gtksheet.c b/lib/gtksheet/gtksheet.c
index eba0ea40..1f0e83fa 100644
--- a/lib/gtksheet/gtksheet.c
+++ b/lib/gtksheet/gtksheet.c
@@ -2440,7 +2440,10 @@ gtk_sheet_dispose  (GObject *object)
   if (sheet->column_geometry) g_object_unref (sheet->column_geometry);
 
   g_object_unref (sheet->entry_container);
+  sheet->entry_container = NULL;
+
   g_object_unref (sheet->button);
+  sheet->button = NULL;
 
   /* unref adjustments */
   if (sheet->hadjustment)