[Pspp-cvs] pspp/lib/gtksheet ChangeLog gtksheet.c

[Ben Pfaff]

CVSROOT:        /cvsroot/pspp
Module name:    pspp
Changes by:     Ben Pfaff <blp> 08/05/07 00:09:00

Modified files:
        lib/gtksheet   : ChangeLog gtksheet.c 

Log message:
        (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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/ChangeLog?cvsroot=pspp&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/pspp/lib/gtksheet/gtksheet.c?cvsroot=pspp&r1=1.46&r2=1.47

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/pspp/pspp/lib/gtksheet/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- ChangeLog   6 Mar 2008 09:47:13 -0000       1.24
+++ ChangeLog   7 May 2008 00:09:00 -0000       1.25
@@ -1,3 +1,10 @@
+2008-05-06  Ben Pfaff  <address@hidden>
+
+       * 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 <address@hidden>
 
        * gsheet-row-iface.c gsheet-row-iface.h: Delete unused, unneccesary

Index: gtksheet.c
===================================================================
RCS file: /cvsroot/pspp/pspp/lib/gtksheet/gtksheet.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- gtksheet.c  3 May 2008 01:22:19 -0000       1.46
+++ gtksheet.c  7 May 2008 00:09:00 -0000       1.47
@@ -2440,7 +2440,10 @@
   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)