luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-21 16:38:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix double free crash (#508224) Patch from Joe Marcus Clarke

Browse Source 
2008-01-09  Alexander Larsson  <alexl@redhat.com>

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


svn path=/trunk/; revision=6281
This commit is contained in:
Alexander Larsson
2008-01-09 08:08:43 +00:00
committed by Alexander Larsson
parent 9c95329347
commit 91d7fdc186
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gio/ChangeLog
View File

@@ -1,3 +1,11 @@
2008-01-09 Alexander Larsson <alexl@redhat.com>
* fam/fam-helper.c:
* fam/gfamdirectorymonitor.c:
* fam/gfamfilemonitor.c:
Fix double free crash (#508224)
Patch from Joe Marcus Clarke
008-01-07 Matthias Clasen <mclasen@redhat.com> 008-01-07 Matthias Clasen <mclasen@redhat.com>
* === Released 2.15.1 === * === Released 2.15.1 ===

2
gio/fam/fam-helper.c
View File

@@ -82,7 +82,7 @@ fam_do_iter_unlocked (void)
cancelled = sub->cancelled; cancelled = sub->cancelled;
if (ev.code == FAMAcknowledge && cancelled) if (ev.code == FAMAcknowledge && cancelled)
{ {
g_free (sub); _fam_sub_free (sub);
continue; continue;
} }

2
gio/fam/gfamdirectorymonitor.c
View File

@@ -50,7 +50,6 @@ g_fam_directory_monitor_finalize (GObject *object)
if (!_fam_sub_cancel (sub)) if (!_fam_sub_cancel (sub))
g_warning ("Unexpected error cancelling fam monitor"); g_warning ("Unexpected error cancelling fam monitor");
_fam_sub_free (sub);
fam_monitor->sub = NULL; fam_monitor->sub = NULL;
} }
@@ -134,7 +133,6 @@ g_fam_directory_monitor_cancel (GFileMonitor* monitor)
if (!_fam_sub_cancel (sub)) if (!_fam_sub_cancel (sub))
g_warning ("Unexpected error cancelling fam monitor"); g_warning ("Unexpected error cancelling fam monitor");
_fam_sub_free (sub);
fam_monitor->sub = NULL; fam_monitor->sub = NULL;
} }

2
gio/fam/gfamfilemonitor.c
View File

@@ -49,7 +49,6 @@ g_fam_file_monitor_finalize (GObject *object)
if (sub) { if (sub) {
if (!_fam_sub_cancel (sub)) if (!_fam_sub_cancel (sub))
g_warning ("Unexpected error cancelling fam monitor"); g_warning ("Unexpected error cancelling fam monitor");
_fam_sub_free (sub);
fam_monitor->sub = NULL; fam_monitor->sub = NULL;
} }
@@ -132,7 +131,6 @@ g_fam_file_monitor_cancel (GFileMonitor* monitor)
if (sub) { if (sub) {
if (!_fam_sub_cancel (sub)) if (!_fam_sub_cancel (sub))
g_warning ("Unexpected error cancelling fam monitor"); g_warning ("Unexpected error cancelling fam monitor");
_fam_sub_free (sub);
fam_monitor->sub = NULL; fam_monitor->sub = NULL;
} }