Check for NULL finalizer. (#476849, Areg Beketovski)

2007-09-19  Behdad Esfahbod  <behdad@gnome.org>

        * glib/ghook.c (g_hook_free): Check for NULL finalizer. (#476849, Areg
        Beketovski)

svn path=/trunk/; revision=5776

diff --git a/ChangeLog b/ChangeLog
index 7d0ae645981ac77f81a2ece4ccddcc05e9f2ec1a..9ce371f168642751647c78f9629f215cf1c4975c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-19  Behdad Esfahbod  <behdad@gnome.org>
+
+       * glib/ghook.c (g_hook_free): Check for NULL finalizer. (#476849, Areg
+       Beketovski)
+
 2007-09-19  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump version

diff --git a/glib/ghook.c b/glib/ghook.c
index 01ab78d9163ba369565b783501eefeaf64f2fd87..d038ee2c2a11d8e472c5f8c4ec56c8c851767308 100644 (file)
--- a/glib/ghook.c
+++ b/glib/ghook.c
@@ -130,7 +130,8 @@ g_hook_free (GHookList *hook_list,
   g_return_if_fail (G_HOOK_IS_UNLINKED (hook));
   g_return_if_fail (!G_HOOK_IN_CALL (hook));
 
-  hook_list->finalize_hook (hook_list, hook);
+  if(hook_list->finalize_hook != NULL)
+      hook_list->finalize_hook (hook_list, hook);
   g_slice_free1 (hook_list->hook_size, hook);
 }