rpms/sound-juicer/devel sound-juicer-mb-crasher.patch, NONE, 1.1 sound-juicer.spec, 1.124, 1.125

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/sound-juicer/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7330

Modified Files:
	sound-juicer.spec 
Added Files:
	sound-juicer-mb-crasher.patch 
Log Message:
* Wed Jan 06 2010 Bastien Nocera <bnocera at redhat.com> 2.28.1-2
- Fix potential musicbrainz crasher


sound-juicer-mb-crasher.patch:
 sj-metadata-musicbrainz3.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE sound-juicer-mb-crasher.patch ---
>From 7f94a7b90f823a123bd7aaa2f49600aabfcbc24b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 10 Dec 2009 19:30:36 +0000
Subject: Fix crasher when MusicBrainz can't read a disc

But we can.
---
diff --git a/libjuicer/sj-metadata-musicbrainz3.c b/libjuicer/sj-metadata-musicbrainz3.c
index 5845e0a..5374399 100644
--- a/libjuicer/sj-metadata-musicbrainz3.c
+++ b/libjuicer/sj-metadata-musicbrainz3.c
@@ -244,6 +244,9 @@ mb_list_albums (SjMetadata *metadata, char **url, GError **error)
   }
 
   priv->disc = mb_read_disc (priv->cdrom);
+  if (priv->disc == NULL)
+    return NULL;
+
   if (url != NULL) {
     mb_get_submission_url (priv->disc, NULL, 0, buffer, sizeof (buffer));
     *url = g_strdup (buffer);
--
cgit v0.8.3.1


Index: sound-juicer.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sound-juicer/devel/sound-juicer.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -p -r1.124 -r1.125
--- sound-juicer.spec	25 Nov 2009 16:05:36 -0000	1.124
+++ sound-juicer.spec	6 Jan 2010 13:04:36 -0000	1.125
@@ -8,7 +8,7 @@
 Name:		sound-juicer
 Summary:	Clean and lean CD ripper
 Version:	2.28.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 Source:		http://download.gnome.org/sources/sound-juicer/2.28/%{name}-%{version}.tar.bz2
@@ -42,11 +42,15 @@ BuildRequires:  desktop-file-utils
 
 ExcludeArch: s390 s390x
 
+# http://git.gnome.org/browse/sound-juicer/patch/?id=7f94a7b90f823a123bd7aaa2f49600aabfcbc24b
+Patch0:		sound-juicer-mb-crasher.patch
+
 %description
 GStreamer-based CD ripping tool. Saves audio CDs to Ogg/vorbis.
 
 %prep
 %setup -q
+%patch0 -p1 -b .mb-crasher
 
 %build
 # work around a gstreamer problem where it
@@ -125,6 +129,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jan 06 2010 Bastien Nocera <bnocera at redhat.com> 2.28.1-2
+- Fix potential musicbrainz crasher
+
 * Wed Nov 25 2009 Bastien Nocera <bnocera at redhat.com> 2.28.1-1
 - Update to 2.28.1