glib r6281 - in trunk/gio: . fam

[alexl]

Author: alexl
Date: Wed Jan  9 08:08:43 2008
New Revision: 6281
URL: http://svn.gnome.org/viewvc/glib?rev=6281&view=rev

Log:
2008-01-09  Alexander Larsson  <[EMAIL PROTECTED]>

        * fam/fam-helper.c:
        * fam/gfamdirectorymonitor.c:
        * fam/gfamfilemonitor.c:
        Fix double free crash (#508224)
        Patch from Joe Marcus Clarke



Modified:
   trunk/gio/ChangeLog
   trunk/gio/fam/fam-helper.c
   trunk/gio/fam/gfamdirectorymonitor.c
   trunk/gio/fam/gfamfilemonitor.c

Modified: trunk/gio/fam/fam-helper.c
==============================================================================
--- trunk/gio/fam/fam-helper.c  (original)
+++ trunk/gio/fam/fam-helper.c  Wed Jan  9 08:08:43 2008
@@ -82,7 +82,7 @@
     cancelled = sub->cancelled;
     if (ev.code == FAMAcknowledge && cancelled)
       {
-       g_free (sub);
+       _fam_sub_free (sub);
        continue;
       }
     

Modified: trunk/gio/fam/gfamdirectorymonitor.c
==============================================================================
--- trunk/gio/fam/gfamdirectorymonitor.c        (original)
+++ trunk/gio/fam/gfamdirectorymonitor.c        Wed Jan  9 08:08:43 2008
@@ -50,7 +50,6 @@
     if (!_fam_sub_cancel (sub))
       g_warning ("Unexpected error cancelling fam monitor");
 
-    _fam_sub_free (sub);
     fam_monitor->sub = NULL;
   }
 
@@ -134,7 +133,6 @@
     if (!_fam_sub_cancel (sub))
       g_warning ("Unexpected error cancelling fam monitor");
 
-    _fam_sub_free (sub);
     fam_monitor->sub = NULL;
   }
 

Modified: trunk/gio/fam/gfamfilemonitor.c
==============================================================================
--- trunk/gio/fam/gfamfilemonitor.c     (original)
+++ trunk/gio/fam/gfamfilemonitor.c     Wed Jan  9 08:08:43 2008
@@ -49,7 +49,6 @@
   if (sub) {
     if (!_fam_sub_cancel (sub))
       g_warning ("Unexpected error cancelling fam monitor");
-    _fam_sub_free (sub);
     fam_monitor->sub = NULL;
   }
 
@@ -132,7 +131,6 @@
   if (sub) {
     if (!_fam_sub_cancel (sub))
       g_warning ("Unexpected error cancelling fam monitor");
-    _fam_sub_free (sub);
     fam_monitor->sub = NULL;
   }
 
_______________________________________________
SVN-commits-list mailing list
SVN-commits-list@gnome.org
http://mail.gnome.org/mailman/listinfo/svn-commits-list