PolicyKit: Branch 'master' - 2 commits

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Tue Nov 6 14:16:27 UTC 2018


 src/polkit/polkitpermission.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 51b6f12337892534df5e65b7d4e6f69341e356a7
Merge: c3646a2 984d16e
Author: Ray Strode <halfline at gmail.com>
Date:   Tue Nov 6 14:16:26 2018 +0000

    Merge branch 'wip/hughsie/no-system-bus' into 'master'
    
    Fix a critical warning on calling polkit_permission_new_sync with no system bus
    
    See merge request polkit/polkit!8

commit 984d16e6d21c6d6b0fc28d4fe7fe82575a43c95b
Author: Richard Hughes <richard at hughsie.com>
Date:   Thu Oct 19 13:43:22 2017 +0100

    Fix a critical warning on calling polkit_permission_new_sync with no system bus

diff --git a/src/polkit/polkitpermission.c b/src/polkit/polkitpermission.c
index f264094..d4b2459 100644
--- a/src/polkit/polkitpermission.c
+++ b/src/polkit/polkitpermission.c
@@ -137,10 +137,13 @@ polkit_permission_finalize (GObject *object)
   g_free (permission->tmp_authz_id);
   g_object_unref (permission->subject);
 
-  g_signal_handlers_disconnect_by_func (permission->authority,
-                                        on_authority_changed,
-                                        permission);
-  g_object_unref (permission->authority);
+  if (permission->authority != NULL)
+    {
+      g_signal_handlers_disconnect_by_func (permission->authority,
+                                            on_authority_changed,
+                                            permission);
+      g_object_unref (permission->authority);
+    }
 
   if (G_OBJECT_CLASS (polkit_permission_parent_class)->finalize != NULL)
     G_OBJECT_CLASS (polkit_permission_parent_class)->finalize (object);


More information about the hal-commit mailing list