rpms/rhythmbox/F-10 rb-mb3-crash.patch, NONE, 1.1 rhythmbox.spec, 1.219, 1.220

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/rhythmbox/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31162

Modified Files:
	rhythmbox.spec 
Added Files:
	rb-mb3-crash.patch 
Log Message:
* Fri Feb 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-20.r6096
- Fix crasher when musicbrainz3 doesn't get a match for an audio CD (#481441)


rb-mb3-crash.patch:

--- NEW FILE rb-mb3-crash.patch ---
Index: libjuicer/sj-metadata-musicbrainz3.c
===================================================================
--- libjuicer/sj-metadata-musicbrainz3.c	(revision 2379)
+++ libjuicer/sj-metadata-musicbrainz3.c	(working copy)
@@ -247,6 +247,11 @@
   mb_release_filter_free (filter);
   g_free (id);
 
+  if (results == NULL) {
+    mb_query_free (query);
+    return NULL;
+  }
+
   if (mb_result_list_get_size (results) == 0) {
     mb_result_list_free (results);
     mb_query_free (query);


Index: rhythmbox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhythmbox/F-10/rhythmbox.spec,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- rhythmbox.spec	19 Jan 2009 16:38:15 -0000	1.219
+++ rhythmbox.spec	13 Feb 2009 11:35:37 -0000	1.220
@@ -3,7 +3,7 @@
 Name: rhythmbox
 Summary: Music Management Application 
 Version: 0.11.6
-Release: 19.r6096%{?dist}
+Release: 20.r6096%{?dist}
 License: GPLv2+ with exceptions and GFDL
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/rhythmbox/
@@ -58,6 +58,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=562188
 Patch1: rb-avahi-assertion.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=565056
+Patch2: rb-mb3-crash.patch
+
 %description
 Rhythmbox is an integrated music management application based on the powerful
 GStreamer media framework. It has a number of features, including an easy to
@@ -91,6 +94,9 @@
 
 %patch0 -p0 -b .dont-disable-suspend
 %patch1 -p1 -b .avahi-assertion
+pushd plugins/audiocd/
+%patch2 -p1 -b .mb3-crash
+popd
 
 %build
 
@@ -227,6 +233,9 @@
 %{_libdir}/rhythmbox/plugins/upnp_coherence
 
 %changelog
+* Fri Feb 13 2009 - Bastien Nocera <bnocera at redhat.com> - 0.11.6-20.r6096
+- Fix crasher when musicbrainz3 doesn't get a match for an audio CD (#481441)
+
 * Mon Jan 19 2009 Brian Pepple <bpepple at fedoraproject.org> - 0.11.6-19.r6096
 - Backport patch to fix avahi assertion in DAAP plugin.
 - Better URL