[easytag] Avoid crash when declining deletion of a file
David King
amigadave at fedoraproject.org
Fri Mar 7 16:02:54 UTC 2014
commit 0692fb67dd2c6430a21e9b43f7c71ba1a19c700f
Author: David King <amigadave at amigadave.com>
Date: Fri Mar 7 15:58:31 2014 +0000
Avoid crash when declining deletion of a file
https://retrace.fedoraproject.org/faf/problems/1586226/
...-2.1.10-avoid-decline-deleting-file-crash.patch | 31 ++++++++++++++++++++
easytag.spec | 5 +++
2 files changed, 36 insertions(+), 0 deletions(-)
---
diff --git a/easytag-2.1.10-avoid-decline-deleting-file-crash.patch b/easytag-2.1.10-avoid-decline-deleting-file-crash.patch
new file mode 100644
index 0000000..11023d7
--- /dev/null
+++ b/easytag-2.1.10-avoid-decline-deleting-file-crash.patch
@@ -0,0 +1,31 @@
+From 17afda799f95c97263e52ab41fa8c9676aba3021 Mon Sep 17 00:00:00 2001
+From: David King <amigadave at amigadave.com>
+Date: Fri, 07 Mar 2014 15:34:08 +0000
+Subject: Avoid crash when declining deleting a file
+
+https://retrace.fedoraproject.org/faf/problems/1586226/
+---
+diff --git a/src/easytag.c b/src/easytag.c
+index 40dbeec..52a1619 100644
+--- a/src/easytag.c
++++ b/src/easytag.c
+@@ -2637,9 +2637,14 @@ Delete_Selected_Files_With_Answer (void)
+ ET_Remove_File_From_File_List(ETFile);
+ break;
+ case 0:
+- Log_Print (LOG_ERROR, _("Cannot delete file (%s)"),
+- error->message);
+- g_error_free (error);
++ /* Distinguish between the file being skipped, and there being
++ * an error during deletion. */
++ if (error)
++ {
++ Log_Print (LOG_ERROR, _("Cannot delete file (%s)"),
++ error->message);
++ g_clear_error (&error);
++ }
+ break;
+ case -1:
+ // Stop deleting files + reinit progress bar
+--
+cgit v0.9.2
diff --git a/easytag.spec b/easytag.spec
index 30bddf1..22e5c50 100644
--- a/easytag.spec
+++ b/easytag.spec
@@ -8,6 +8,7 @@ Group: Applications/Multimedia
URL: https://wiki.gnome.org/Apps/EasyTAG
Source: http://download.gnome.org/sources/easytag/2.1/easytag-%{version}.tar.xz
Patch0: easytag-2.1.10-avoid-close-button-crash.patch
+Patch1: easytag-2.1.10-avoid-decline-deleting-file-crash.patch
BuildRequires: appdata-tools
BuildRequires: desktop-file-utils
BuildRequires: docbook-dtds
@@ -32,6 +33,7 @@ MP2, FLAC, Ogg Vorbis, MusePack and Monkey's Audio files.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
@@ -73,6 +75,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Fri Mar 07 2014 David King <amigadave at amigadave.com> 2.1.10-3
+- Avoid crash when declining deletion of a file
+
* Mon Mar 03 2014 David King <amigadave at amigadave.com> 2.1.10-2
- Avoid crash when clicking the window close button (#1071563)
More information about the scm-commits
mailing list