Fix double g_error_free call in remote_close_callback (bug 2271363)

f39 imports/f39/gnome-commander-1.16.1-6.el9
Mamoru TASAKA 8 months ago
parent 63b505fb1b
commit 1cb843a399

@ -0,0 +1,27 @@
From ed704b30992b7f576060c424e431d6909504b9b4 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
Date: Thu, 18 Apr 2024 19:56:24 +0900
Subject: [PATCH] Fix double g_error_free call in remote_close_callback
gnome_cmd_error_message() calls g_error_free() internally,
so no need to call g_error_free() again in
remote_close_callback().
---
src/gnome-cmd-con-remote.cc | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/gnome-cmd-con-remote.cc b/src/gnome-cmd-con-remote.cc
index 85f87e3d..39a131e5 100644
--- a/src/gnome-cmd-con-remote.cc
+++ b/src/gnome-cmd-con-remote.cc
@@ -125,7 +125,6 @@ static void remote_close_callback(GObject *gobj, GAsyncResult *result, gpointer
if (error && !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CLOSED))
{
gnome_cmd_error_message(_("Disconnect error"), error);
- g_error_free(error);
return;
}
if (error)
--
GitLab

@ -40,7 +40,7 @@
%global shortver 1.16
%global fullver %{shortver}.1
%global baserelease 5
%global baserelease 6
%if 0%{?use_release} >= 1
%global fedorarel %{?prever:0.}%{baserelease}%{?prever:.%{prerpmver}}
@ -75,6 +75,9 @@ Source1: gnome-commander.sh
Source2: create-gcmd-git-bare-tarball.sh
Source10: mimeedit-svn%{mimeedit_rev}.sh
Patch1: gnome-commander-1.6.0-path-fedora-specific.patch
# https://gitlab.gnome.org/GNOME/gnome-commander/-/merge_requests/55
# https://bugzilla.redhat.com/show_bug.cgi?id=2271363
Patch2: gnome-commander-MR55-fix-double-g_free_error.patch
BuildRequires: gcc-c++
%if 0%{?use_gcc_strict_sanitize}
@ -178,6 +181,7 @@ git commit -m "base" -q
%patch -P1 -p1 -b .path
git commit -m "Apply Fedora specific path configuration" -a
cat %PATCH2 | git am
%if 0%{?use_release}
%endif
@ -288,6 +292,9 @@ popd
%{_datadir}/pixmaps/%{name}/
%changelog
* Thu Apr 18 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.16.1-6
- Fix double g_error_free call in remote_close_callback (bug 2271363)
* Sun Jan 28 2024 Mamoru TASAKA <mtasaka@fedoraproject.org> - 4:1.16.1-5
- SPDX migration

Loading…
Cancel
Save