From 5fa8c6ef89972dbe2e8c170ab61ece36a9469cb6 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Wed, 19 Sep 2007 20:36:53 +0000 Subject: [PATCH] Check for NULL finalizer. (#476849, Areg Beketovski) 2007-09-19 Behdad Esfahbod * glib/ghook.c (g_hook_free): Check for NULL finalizer. (#476849, Areg Beketovski) svn path=/trunk/; revision=5776 --- ChangeLog | 5 +++++ glib/ghook.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7d0ae6459..9ce371f16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-09-19 Behdad Esfahbod + + * glib/ghook.c (g_hook_free): Check for NULL finalizer. (#476849, Areg + Beketovski) + 2007-09-19 Matthias Clasen * configure.in: Bump version diff --git a/glib/ghook.c b/glib/ghook.c index 01ab78d91..d038ee2c2 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); }