33 lines
1015 B
Diff
33 lines
1015 B
Diff
From 59f2d96ce3ac63173669f299a9453a7bf5e70a70 Mon Sep 17 00:00:00 2001
|
|
From: Adam Jackson <ajax@nwnk.net>
|
|
Date: Tue, 09 Oct 2012 18:08:24 +0000
|
|
Subject: 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>
|
|
---
|
|
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;
|
|
}
|
|
|
|
--
|
|
cgit v0.9.0.2-2-gbebe
|