From 1f3aa5157e93f59a90256b8595121537afa17105 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Feb 03 2010 20:51:14 +0000
Subject: - Prevent race condition crash in streambrowser GUI (#561469).


---

diff --git a/audacious-plugins-2.2-streambrowser-race.patch b/audacious-plugins-2.2-streambrowser-race.patch
new file mode 100644
index 0000000..5e7c5dc
--- /dev/null
+++ b/audacious-plugins-2.2-streambrowser-race.patch
@@ -0,0 +1,30 @@
+diff -Nur audacious-plugins-2.2-orig/src/streambrowser/gui/streambrowser_win.c audacious-plugins-2.2/src/streambrowser/gui/streambrowser_win.c
+--- audacious-plugins-2.2-orig/src/streambrowser/gui/streambrowser_win.c	2009-11-22 23:49:53.000000000 +0100
++++ audacious-plugins-2.2/src/streambrowser/gui/streambrowser_win.c	2010-02-03 21:43:22.000000000 +0100
+@@ -44,7 +44,7 @@
+ static GtkWidget*		add_button;
+ static GtkWidget*		bookmark_button;
+ static GtkWidget*		streambrowser_window;
+-static GList*			streamdir_gui_list;
++static GList*			streamdir_gui_list = NULL;
+ static GtkCellRenderer*	cell_renderer_pixbuf;
+ static GtkCellRenderer*	cell_renderer_text;
+ 
+@@ -236,6 +236,8 @@
+ void streambrowser_win_set_category_state(streamdir_t *streamdir, category_t *category, gboolean fetching)
+ {
+ 	streamdir_gui_t *streamdir_gui = find_streamdir_gui_by_streamdir(streamdir);
++    if (!streamdir_gui)
++        return;
+ 	GtkTreeView *tree_view = GTK_TREE_VIEW(streamdir_gui->tree_view);
+ 	GtkTreeStore *store = GTK_TREE_STORE(gtk_tree_view_get_model(tree_view));
+ 	GtkTreePath *path;
+@@ -260,6 +262,8 @@
+ void streambrowser_win_set_streaminfo_state(streamdir_t *streamdir, category_t *category, streaminfo_t *streaminfo, gboolean fetching)
+ {
+ 	streamdir_gui_t *streamdir_gui = find_streamdir_gui_by_streamdir(streamdir);
++    if (!streamdir_gui)
++        return;
+ 	GtkTreeView *tree_view = GTK_TREE_VIEW(streamdir_gui->tree_view);
+ 	GtkTreeStore *store = GTK_TREE_STORE(gtk_tree_view_get_model(tree_view));
+ 	GtkTreePath *path;
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 3173228..2081d12 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -44,6 +44,8 @@ Patch8: audacious-plugins-2.2-neon-session-destroy.patch
 Patch9: audacious-plugins-2.2-adplug-fclose.patch
 #
 Patch10: audacious-plugins-2.2-adplug-lds.patch
+#
+Patch11: audacious-plugins-2.2-streambrowser-race.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -184,6 +186,7 @@ in Vortex (.vtx) format.
 %patch8 -p1 -b .neon-session-destroy
 %patch9 -p1 -b .adplug-fclose
 %patch10 -p1 -b .lds-out-of-bounds
+%patch11 -p1 -b .streambrowser-race
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -277,6 +280,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Wed Feb  3 2010 Michael Schwendt <mschwendt@fedoraproject.org> - 2.2-15
+- Prevent race condition crash in streambrowser GUI (#561469).
+
 * Tue Jan 26 2010 Michael Schwendt <mschwendt@fedoraproject.org> - 2.2-14
 - Fix too many open file descriptors issue in adplug plugin.
 - Guard against out-of-bounds array access in adplug .lds decoder.
@@ -286,7 +292,7 @@ update-desktop-database &> /dev/null || :
   pointers to NULL, so vfs seek doesn't crash.
 
 * Fri Jan 22 2010 Adrian Reber <adrian@lisas.de> - 2.2-12
-- Rebuild for libcdio-0.82
+- Rebuild for libcdio-0.82 (F-13 Rawhide only)
 
 * Sun Jan 17 2010 Michael Schwendt <mschwendt@fedoraproject.org> - 2.2-11
 - Rebuild for audacious.pc --libs changes.