rpms/rhythmbox/devel 0001-Fix-crasher-when-MusicBrainz-can-t-read-a-disc.patch, NONE, 1.1 rhythmbox.spec, 1.279, 1.280

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18621

Modified Files:
	rhythmbox.spec 
Added Files:
	0001-Fix-crasher-when-MusicBrainz-can-t-read-a-disc.patch 
Log Message:
* Thu Dec 10 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-4
- Fix crasher when musicbrainz cannot read a disc (#546188)


0001-Fix-crasher-when-MusicBrainz-can-t-read-a-disc.patch:
 sj-metadata-musicbrainz3.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE 0001-Fix-crasher-when-MusicBrainz-can-t-read-a-disc.patch ---
>From e65be779b4d39161db212e54bc5892f5598c0487 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Thu, 10 Dec 2009 19:32:31 +0000
Subject: [PATCH] Fix crasher when MusicBrainz can't read a disc

But we can.

https://bugzilla.redhat.com/show_bug.cgi?id=546188
---
 plugins/audiocd/sj-metadata-musicbrainz3.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/plugins/audiocd/sj-metadata-musicbrainz3.c b/plugins/audiocd/sj-metadata-musicbrainz3.c
index 5845e0a..5374399 100644
--- a/plugins/audiocd/sj-metadata-musicbrainz3.c
+++ b/plugins/audiocd/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);
-- 
1.6.5.2



Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/devel/rhythmbox.spec,v
retrieving revision 1.279
retrieving revision 1.280
diff -u -p -r1.279 -r1.280
--- rhythmbox.spec	10 Dec 2009 15:47:12 -0000	1.279
+++ rhythmbox.spec	10 Dec 2009 19:34:44 -0000	1.280
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application
 Version: 0.12.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -55,6 +55,8 @@ Patch0: rb-no-HEAD-for-podcasts.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=540672
 # https://bugzilla.gnome.org/show_bug.cgi?id=602140
 Patch1: rb-webkit-crasher.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=546188
+Patch2: 0001-Fix-crasher-when-MusicBrainz-can-t-read-a-disc.patch
 
 %description
 Rhythmbox is an integrated music management application based on the powerful
@@ -221,6 +223,9 @@ fi
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Thu Dec 10 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-4
+- Fix crasher when musicbrainz cannot read a disc (#546188)
+
 * Thu Dec 10 2009 Bastien Nocera <bnocera at redhat.com> 0.12.6-3
 - Fix crasher in WebKit when using the context pane (#540672)