PolicyKit: Branch 'master'

[David Zeuthen]

 src/polkitagent/polkitagentlistener.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 59f2d96ce3ac63173669f299a9453a7bf5e70a70
Author: Adam Jackson <ajax at nwnk.net>
Date:   Tue Oct 9 14:08:24 2012 -0400

    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 at 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;
 }