[SCM] easytag/master: Add patch from upstream fixing crash when reading invalid id3 tags

jcowgill-guest at users.alioth.debian.org jcowgill-guest at users.alioth.debian.org
Mon Nov 17 22:17:39 UTC 2014


The following commit has been merged in the master branch:
commit 7ba8d84c469e692ec2c5aff79f2084fa25e99148
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Mon Nov 17 21:12:15 2014 +0000

    Add patch from upstream fixing crash when reading invalid id3 tags

diff --git a/debian/patches/0001-Set-the-GError-when-failing-to-read-ID3-tags.patch b/debian/patches/0001-Set-the-GError-when-failing-to-read-ID3-tags.patch
new file mode 100644
index 0000000..45e908d
--- /dev/null
+++ b/debian/patches/0001-Set-the-GError-when-failing-to-read-ID3-tags.patch
@@ -0,0 +1,34 @@
+From cef074fd5f2bd538817577d5ca93d6d4e3c3c20e Mon Sep 17 00:00:00 2001
+From: David King <amigadave at amigadave.com>
+Date: Sun, 2 Nov 2014 18:48:42 +0000
+Subject: [PATCH] Set the GError when failing to read ID3 tags
+
+---
+ src/tags/id3v24_tag.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/tags/id3v24_tag.c b/src/tags/id3v24_tag.c
+index 76ab6f2..b18de6a 100644
+--- a/src/tags/id3v24_tag.c
++++ b/src/tags/id3v24_tag.c
+@@ -227,6 +227,8 @@ id3tag_read_file_tag (GFile *gfile,
+     if ((file = id3_file_open (filename, ID3_FILE_MODE_READONLY)) == NULL)
+     {
+         g_free (filename);
++        g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "%s",
++                     _("Error reading tags from file"));
+         return FALSE;
+     }
+ 
+@@ -236,6 +238,8 @@ id3tag_read_file_tag (GFile *gfile,
+     ||   (tag->nframes == 0))
+     {
+         id3_file_close(file);
++        g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "%s",
++                     _("Error reading tags from file"));
+         return FALSE;
+     }
+ 
+-- 
+2.1.3
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..d9d0dbc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Set-the-GError-when-failing-to-read-ID3-tags.patch

-- 
easytag packaging



More information about the pkg-multimedia-commits mailing list