PolicyKit: Branch 'master'

[Miloslav Trmac]

 src/polkit/polkitsubject.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c8738941be18ef05ce724df46547f41dbc02fb5
Author: Miloslav Trmač <mitr at redhat.com>
Date:   Mon Sep 15 19:45:15 2014 +0200

    Fix duplicate GError use when "uid" is missing
    
    Some GLib versions complain loudly about this.
    
    To reproduce, call e.g. RegisterAuthenticationAgent with the following
    parameters:
    ("unix-process", {"pid": __import__('gi.repository.GLib', globals(),
    locals(), ['Variant']).Variant("u", 1), "start-time":
    __import__('gi.repository.GLib', globals(), locals(),
    ['Variant']).Variant("t", 1)}), "cs", "/"
    
    https://bugs.freedesktop.org/show_bug.cgi?id=90877

diff --git a/src/polkit/polkitsubject.c b/src/polkit/polkitsubject.c
index b86e0b9..df8e1aa 100644
--- a/src/polkit/polkitsubject.c
+++ b/src/polkit/polkitsubject.c
@@ -428,7 +428,7 @@ polkit_subject_new_for_gvariant (GVariant  *variant,
       start_time = g_variant_get_uint64 (v);
       g_variant_unref (v);
 
-      v = lookup_asv (details_gvariant, "uid", G_VARIANT_TYPE_INT32, error);
+      v = lookup_asv (details_gvariant, "uid", G_VARIANT_TYPE_INT32, NULL);
       if (v != NULL)
         {
           uid = g_variant_get_int32 (v);