[arch-commits] Commit in network-manager-applet/trunk (2 files)

[Jan Steffens]

    Date: Thursday, December 21, 2017 @ 18:41:17
  Author: heftig
Revision: 313498

1.8.10-5

Modified:
  network-manager-applet/trunk/0001-shared-compat-Fix-memory-handling-of-nm_setting_vpn_.patch
  network-manager-applet/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-shared-compat-Fix-memory-handling-of-nm_setting_vpn_.patch |   33 +++++++---
 PKGBUILD                                                        |    4 -
 2 files changed, 28 insertions(+), 9 deletions(-)

Modified: 0001-shared-compat-Fix-memory-handling-of-nm_setting_vpn_.patch
===================================================================
--- 0001-shared-compat-Fix-memory-handling-of-nm_setting_vpn_.patch	2017-12-21 18:34:55 UTC (rev 313497)
+++ 0001-shared-compat-Fix-memory-handling-of-nm_setting_vpn_.patch	2017-12-21 18:41:17 UTC (rev 313498)
@@ -1,5 +1,5 @@
-From d4dee89e97952dff63a65ea850ab7aeac2d1f9c0 Mon Sep 17 00:00:00 2001
-Message-Id: <d4dee89e97952dff63a65ea850ab7aeac2d1f9c0.1513880568.git.jan.steffens at gmail.com>
+From 313649cccb8aa137ef7135f69dc56fd6fcf1a1db Mon Sep 17 00:00:00 2001
+Message-Id: <313649cccb8aa137ef7135f69dc56fd6fcf1a1db.1513881566.git.jan.steffens at gmail.com>
 From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
 Date: Thu, 21 Dec 2017 18:22:55 +0100
 Subject: [PATCH] shared/compat: Fix memory handling of
@@ -16,15 +16,34 @@
 
 Fixes: 272439cb2077a889485dd195bb6b99ca91d3e3bf
 ---
- shared/nm-utils/nm-compat.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ shared/nm-utils/nm-compat.c | 17 ++++++++++++-----
+ 1 file changed, 12 insertions(+), 5 deletions(-)
 
 diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c
-index 22ab675de8373639..ba50a509a3a5f530 100644
+index 22ab675de8373639..b470e804c08441b4 100644
 --- a/shared/nm-utils/nm-compat.c
 +++ b/shared/nm-utils/nm-compat.c
-@@ -54,15 +54,15 @@ _get_keys (NMSettingVpn *setting,
- 	if (a->len) {
+@@ -44,25 +44,32 @@ _get_keys (NMSettingVpn *setting,
+ 
+ 	nm_assert (NM_IS_SETTING_VPN (setting));
+ 
+-	a = g_ptr_array_new ();
++	if (is_secrets)
++		len = nm_setting_vpn_get_num_secrets (setting);
++	else
++		len = nm_setting_vpn_get_num_data_items (setting);
++
++	a = g_ptr_array_new_full (len + 1, (GDestroyNotify) g_free);
++
+ 	if (is_secrets)
+ 		nm_setting_vpn_foreach_secret (setting, _get_keys_cb, a);
+ 	else
+ 		nm_setting_vpn_foreach_data_item (setting, _get_keys_cb, a);
++
+ 	len = a->len;
+ 
+-	if (a->len) {
++	if (len) {
  		g_ptr_array_sort (a, nm_strcmp_p);
  		g_ptr_array_add (a, NULL);
 -		keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-21 18:34:55 UTC (rev 313497)
+++ PKGBUILD	2017-12-21 18:41:17 UTC (rev 313498)
@@ -11,7 +11,7 @@
 pkgdesc="Applet for managing network connections"
 url="https://wiki.gnome.org/Projects/NetworkManager/"
 pkgver=1.8.10
-pkgrel=4
+pkgrel=5
 arch=(x86_64)
 license=(GPL2 LGPL2.1)
 depends=(libnm-glib libgudev gtk3 mobile-broadband-provider-info iso-codes gcr)
@@ -21,7 +21,7 @@
 source=("git+https://git.gnome.org/browse/network-manager-applet#commit=$_commit"
         0001-shared-compat-Fix-memory-handling-of-nm_setting_vpn_.patch)
 sha256sums=('SKIP'
-            '34a9e2232dc93be3f35c5e25ed26f7a687063a55d3a21e05f77e52f469f8b71a')
+            'da92d8988face3cf9ec618326151d44459df122b320801782e267af721ad9eb2')
 
 pkgver() {
   cd $pkgbase