rpms/network-manager-applet
7
0
Fork 0
Code Issues Pull Requests Releases Activity

applet: fix double-free in ap-menu-item (rh #1585302)

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=1585302
https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/2
This commit is contained in:
Thomas Haller 2018-06-04 17:07:12 +02:00
parent 0889187260
commit 04b3f3f1f0
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0002-fix-double-free-rh1585302.patch Normal file
View File

@ -0,0 +1,30 @@
From 2c3ad506c6607cef922b97919b6250a1243cc57e Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
Date: Tue, 29 May 2018 22:05:07 +0200
Subject: [PATCH 1/1] NMNetworkMenuItem: Don't double-free priv->dupes
https://bugs.archlinux.org/task/58767
https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/2
Fixes: 15ac92e6a42317e86ffb6d52a9ce5cacbf9e8c87
(cherry picked from commit 40a6dd2f22c32ec668287d019ef6667c297d17ec)
---
src/ap-menu-item.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/ap-menu-item.c b/src/ap-menu-item.c
index 92953c04..7d614f45 100644
--- a/src/ap-menu-item.c
+++ b/src/ap-menu-item.c
@@ -327,7 +327,6 @@ finalize (GObject *object)
g_free (priv->ssid_string);
g_slist_free_full (priv->dupes, g_free);
- g_slist_free (priv->dupes);
G_OBJECT_CLASS (nm_network_menu_item_parent_class)->finalize (object);
}
--
2.17.0

7
network-manager-applet.spec
View File

@ -5,7 +5,7 @@
%global rpm_version 1.8.12 %global rpm_version 1.8.12
%global real_version 1.8.12 %global real_version 1.8.12
%global release_version 3 %global release_version 4
%global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p') %global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p')
@ -29,6 +29,7 @@ Patch1: 0001-nm-applet-no-notifications.patch
# https://gitlab.gnome.org/GNOME/network-manager-applet/issues/1 # https://gitlab.gnome.org/GNOME/network-manager-applet/issues/1
# https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/3 # https://gitlab.gnome.org/GNOME/network-manager-applet/merge_requests/3
Patch2: 0001-Handle-keep-above-passed-through-to-editor_command_l.patch Patch2: 0001-Handle-keep-above-passed-through-to-editor_command_l.patch
Patch3: 0002-fix-double-free-rh1585302.patch
Requires: NetworkManager >= %{nm_version} Requires: NetworkManager >= %{nm_version}
Requires: libnotify >= 0.4.3 Requires: libnotify >= 0.4.3
@ -129,6 +130,7 @@ This package deprecates libnm-gtk.
%setup -q -n "%{name}-%{real_version}" %setup -q -n "%{name}-%{real_version}"
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%build %build
%meson \ %meson \
@ -222,6 +224,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
%changelog %changelog
* Mon Jun 4 2018 Thomas Haller <thaller@redhat.com> - 1.8.12-4
- applet: fix double-free in ap-menu-item (rh #1585302)
* Fri Jun 01 2018 Adam Williamson <awilliam@redhat.com> - 1.8.12-3 * Fri Jun 01 2018 Adam Williamson <awilliam@redhat.com> - 1.8.12-3
- Fix GGO #1 (nm-connection-editor --keep-above fails with any other arg) - Fix GGO #1 (nm-connection-editor --keep-above fails with any other arg)