summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2012-10-09 14:08:24 -0400
committerDavid Zeuthen <zeuthen@gmail.com>2012-10-09 14:08:24 -0400
commit59f2d96ce3ac63173669f299a9453a7bf5e70a70 (patch)
tree70cbe8b5057ee6f3c9d58bf3fed4107920107301
parentfa04223240d46641b0773dbf9f7d72f529046bea (diff)
downloadpolkit-59f2d96ce3ac63173669f299a9453a7bf5e70a70.tar.gz
PolkitAgent: Avoid crashing if initializing the server object fails
Note that otherwise we return a freed server object. Since later in polkit_agent_listener_register_with_options we check against NULL to determine failure, this makes for sad times later when we call server_free() on it again. https://bugs.freedesktop.org/show_bug.cgi?id=55776 Signed-off-by: David Zeuthen <zeuthen@gmail.com>
-rw-r--r--src/polkitagent/polkitagentlistener.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/polkitagent/polkitagentlistener.c b/src/polkitagent/polkitagentlistener.c
index 0d97501..5bddd03 100644
--- a/src/polkitagent/polkitagentlistener.c
+++ b/src/polkitagent/polkitagentlistener.c
@@ -260,10 +260,9 @@ server_new (PolkitSubject *subject,
if (!server_init_sync (server, cancellable, error))
{
server_free (server);
- goto out;
+ return NULL;
}
- out:
return server;
}