From 77eeb95233b3fcf6510fc2c30eeb94daa7ce487c Mon Sep 17 00:00:00 2001 From: Mikhail Efremov Date: Sat, 5 Mar 2011 00:01:01 -0600 Subject: [PATCH] settings: don't dereference NULL pointer on request removal --- src/settings/nm-agent-manager.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c index 0ffcfd454e..54b7d53440 100644 --- a/src/settings/nm-agent-manager.c +++ b/src/settings/nm-agent-manager.c @@ -448,7 +448,8 @@ request_free (Request *req) if (req->idle_id) g_source_remove (req->idle_id); - req->cancel_callback (req); + if (req->cancel_callback) + req->cancel_callback (req); g_slist_free (req->pending); g_slist_free (req->asked); @@ -459,7 +460,8 @@ request_free (Request *req) g_hash_table_unref (req->existing_secrets); if (req->chain) nm_auth_chain_unref (req->chain); - g_object_unref (req->authority); + if (req->authority) + g_object_unref (req->authority); memset (req, 0, sizeof (Request)); g_free (req); }