r47289 - in /desktop/unstable/gnome-shell/debian: changelog patches/01-NetworkAgent-Fix-double-unref-in-get_secrets_keyring.patch patches/series

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Jan 31 15:03:23 2016
New Revision: 47289

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=47289
Log:
Fix double-unref in get_secrets_keyring_cb(). This fixes a crash in
NetworkAgent when trying to acquire secrets from gnome-keyring, like VPN
passwords. Patch cherry-picked from upstream Git.

Added:
    desktop/unstable/gnome-shell/debian/patches/01-NetworkAgent-Fix-double-unref-in-get_secrets_keyring.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/series

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=47289&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog	[utf-8] Sun Jan 31 15:03:23 2016
@@ -1,3 +1,11 @@
+gnome-shell (3.18.3-3) UNRELEASED; urgency=medium
+
+  * Fix double-unref in get_secrets_keyring_cb(). This fixes a crash in
+    NetworkAgent when trying to acquire secrets from gnome-keyring, like VPN
+    passwords. Patch cherry-picked from upstream Git.
+
+ -- Michael Biebl <biebl at debian.org>  Sun, 31 Jan 2016 15:41:26 +0100
+
 gnome-shell (3.18.3-2) unstable; urgency=medium
 
   * Update the dependency on gir1.2-gdm3 to gir1.2-gdm-1.0 for the changes in

Added: desktop/unstable/gnome-shell/debian/patches/01-NetworkAgent-Fix-double-unref-in-get_secrets_keyring.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/01-NetworkAgent-Fix-double-unref-in-get_secrets_keyring.patch?rev=47289&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/01-NetworkAgent-Fix-double-unref-in-get_secrets_keyring.patch	(added)
+++ desktop/unstable/gnome-shell/debian/patches/01-NetworkAgent-Fix-double-unref-in-get_secrets_keyring.patch	[utf-8] Sun Jan 31 15:03:23 2016
@@ -0,0 +1,30 @@
+From: Christophe Fergeau <cfergeau at redhat.com>
+Date: Sun, 20 Dec 2015 20:51:52 +0100
+Subject: [PATCH] NetworkAgent: Fix double-unref in get_secrets_keyring_cb()
+
+In get_secrets_keyring_cb, we own a ref on the 'attributes' hash table
+from secret_item_get_attributes), and a ref on the 'secret' object (from
+secret_item_get_secret(), but in the SHELL_KEYRING_SK_TAG case, we unref
+these once before breaking out of the loop, and the second time after
+breaking out of the loop.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=759708
+
+(cherry-picked from commit 021cecbce289f1d9c68a156d5b8dd204a73bc715)
+---
+ src/shell-network-agent.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+Index: gnome-shell-3.18.3/src/shell-network-agent.c
+===================================================================
+--- gnome-shell-3.18.3.orig/src/shell-network-agent.c	2016-01-31 15:14:29.470801330 +0100
++++ gnome-shell-3.18.3/src/shell-network-agent.c	2016-01-31 15:14:29.466801245 +0100
+@@ -315,8 +315,6 @@
+ 
+               secrets_found = TRUE;
+ 
+-              g_hash_table_unref (attributes);
+-              secret_value_unref (secret);
+               break;
+             }
+         }

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=47289&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series	[utf-8] Sun Jan 31 15:03:23 2016
@@ -1,3 +1,4 @@
+01-NetworkAgent-Fix-double-unref-in-get_secrets_keyring.patch
 27-nm-libexec-path.patch
 #30-remoteMenu-Prevent-the-shell-from-becoming-unrespons.patch
 41-handle-logind-fail.patch