You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gnome-vfs2/gnome-vfs-atexit-fix.patch

37 lines
1.3 KiB

Index: libgnomevfs/gnome-vfs-module-callback.c
===================================================================
RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-module-callback.c,v
retrieving revision 1.10
diff -u -p -r1.10 gnome-vfs-module-callback.c
--- libgnomevfs/gnome-vfs-module-callback.c 14 Nov 2005 11:41:13 -0000 1.10
+++ libgnomevfs/gnome-vfs-module-callback.c 7 Nov 2006 09:03:37 -0000
@@ -411,11 +411,17 @@ stack_table_destroy (gpointer specific)
stack_table = specific;
g_static_mutex_lock (&callback_table_lock);
- g_hash_table_remove (stack_tables_to_free, stack_table);
+ if (stack_tables_to_free != NULL) {
+ g_hash_table_remove (stack_tables_to_free, stack_table);
+ } else {
+ stack_table = NULL;
+ }
g_static_mutex_unlock (&callback_table_lock);
- clear_stack_table (stack_table);
- g_hash_table_destroy (stack_table);
+ if (stack_table) {
+ clear_stack_table (stack_table);
+ g_hash_table_destroy (stack_table);
+ }
}
static gboolean
@@ -440,6 +446,7 @@ free_stack_tables_to_free (void)
g_static_mutex_lock (&callback_table_lock);
g_hash_table_foreach_remove (stack_tables_to_free, stack_table_free_hr_func , NULL);
g_hash_table_destroy (stack_tables_to_free);
+ stack_tables_to_free = NULL;
g_static_mutex_unlock (&callback_table_lock);
}