rpms/gnome-control-center
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Backport MR #1478 to fix crash on empty EAP password edit (#2136471)

Browse Source
This commit is contained in:
Adam Williamson 2022-10-21 13:03:07 -07:00
parent 7aa0415a8d
commit ff321865e9
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
1478.patch Normal file
View File

@ -0,0 +1,40 @@
From 478e9eb3ca32ec3e4cc9611a0af7744fd6a958f3 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@redhat.com>
Date: Fri, 21 Oct 2022 10:23:01 -0500
Subject: [PATCH] network: fix crashes in eap-method-simple
When the stored password is missing, we will crash passing NULL to a
non-nullable GTK API function.
Fixes #1905
---
panels/network/wireless-security/eap-method-simple.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/panels/network/wireless-security/eap-method-simple.c b/panels/network/wireless-security/eap-method-simple.c
index 3dda8df28..7bb29ec9c 100644
--- a/panels/network/wireless-security/eap-method-simple.c
+++ b/panels/network/wireless-security/eap-method-simple.c
@@ -200,7 +200,8 @@ static void
set_username (EAPMethod *method, const gchar *username)
{
EAPMethodSimple *self = EAP_METHOD_SIMPLE (method);
- gtk_editable_set_text (GTK_EDITABLE (self->username_entry), username);
+ if (username)
+ gtk_editable_set_text (GTK_EDITABLE (self->username_entry), username);
}
static const gchar *
@@ -214,7 +215,8 @@ static void
set_password (EAPMethod *method, const gchar *password)
{
EAPMethodSimple *self = EAP_METHOD_SIMPLE (method);
- gtk_editable_set_text (GTK_EDITABLE (self->password_entry), password);
+ if (password)
+ gtk_editable_set_text (GTK_EDITABLE (self->password_entry), password);
}
static gboolean
--
GitLab

5
gnome-control-center.spec
View File

@ -19,6 +19,11 @@ Summary: Utilities to configure the GNOME desktop
License: GPLv2+ and CC-BY-SA
URL: https://gitlab.gnome.org/GNOME/gnome-control-center/
Source0: https://download.gnome.org/sources/%{name}/43/%{name}-%{tarball_version}.tar.xz
# Fix crash when editing EAP connections with empty password
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/merge_requests/1478
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1905
# https://bugzilla.redhat.com/show_bug.cgi?id=2136471
Patch0: 1478.patch
BuildRequires: desktop-file-utils
BuildRequires: docbook-style-xsl libxslt