Backport fix for GSocketClient crash
This commit is contained in:
parent
74300be378
commit
8f38a70fd6
32
1728.patch
Normal file
32
1728.patch
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
From c2b8fa8a34765d42be69e7eb9a4c44eeb970f775 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Michael Catanzaro <mcatanzaro@gnome.org>
|
||||||
|
Date: Wed, 28 Oct 2020 10:41:13 -0500
|
||||||
|
Subject: [PATCH] gsocketclient: fix crash when async connection step fails
|
||||||
|
|
||||||
|
This is a regression from !1686. The tmp_error is no longer valid after
|
||||||
|
it is "considered" and cannot be used at this point. We should print the
|
||||||
|
error earlier instead.
|
||||||
|
|
||||||
|
Fixes #2233
|
||||||
|
---
|
||||||
|
gio/gsocketclient.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/gio/gsocketclient.c b/gio/gsocketclient.c
|
||||||
|
index ce3c186fb..373774682 100644
|
||||||
|
--- a/gio/gsocketclient.c
|
||||||
|
+++ b/gio/gsocketclient.c
|
||||||
|
@@ -1837,9 +1837,9 @@ g_socket_client_connected_callback (GObject *source,
|
||||||
|
{
|
||||||
|
if (!g_cancellable_is_cancelled (attempt->cancellable))
|
||||||
|
{
|
||||||
|
+ g_debug ("GSocketClient: Connection attempt failed: %s", data->error_info->tmp_error->message);
|
||||||
|
clarify_connect_error (data->error_info->tmp_error, data->connectable, attempt->address);
|
||||||
|
consider_tmp_error (data->error_info, G_SOCKET_CLIENT_CONNECTING);
|
||||||
|
- g_debug ("GSocketClient: Connection attempt failed: %s", data->error_info->tmp_error->message);
|
||||||
|
connection_attempt_remove (attempt);
|
||||||
|
connection_attempt_unref (attempt);
|
||||||
|
try_next_connection_or_finish (data, FALSE);
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
@ -1,12 +1,15 @@
|
|||||||
Name: glib2
|
Name: glib2
|
||||||
Version: 2.67.0
|
Version: 2.67.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: A library of handy utility functions
|
Summary: A library of handy utility functions
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: http://www.gtk.org
|
URL: http://www.gtk.org
|
||||||
Source0: http://download.gnome.org/sources/glib/2.67/glib-%{version}.tar.xz
|
Source0: http://download.gnome.org/sources/glib/2.67/glib-%{version}.tar.xz
|
||||||
|
|
||||||
|
# https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1728
|
||||||
|
Patch0: 1728.patch
|
||||||
|
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
@ -214,6 +217,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
|
|||||||
%{_datadir}/installed-tests
|
%{_datadir}/installed-tests
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 04 2020 Michael Catanzaro <mcatanzaro@redhat.com> - 2.67.0-2
|
||||||
|
- Backport fix for GSocketClient crash
|
||||||
|
|
||||||
* Thu Oct 29 2020 Kalev Lember <klember@redhat.com> - 2.67.0-1
|
* Thu Oct 29 2020 Kalev Lember <klember@redhat.com> - 2.67.0-1
|
||||||
- Update to 2.67.0
|
- Update to 2.67.0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user