From: Behdad Esfahbod <behdad@gnome.org>
Date: Wed, 19 Sep 2007 20:36:53 +0000 (+0000)
Subject: Check for NULL finalizer. (#476849, Areg Beketovski)
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=5fa8c6ef89972dbe2e8c170ab61ece36a9469cb6;p=dana%2Fcg-glib.git

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 7d0ae645..9ce371f1 100644
--- 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 01ab78d9..d038ee2c 100644
--- 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);
 }