From 2bab5a8bc14a742440a46061d63c2152d6e139fb Mon Sep 17 00:00:00 2001 From: Michael Schwendt Date: Dec 17 2009 22:13:47 +0000 Subject: - Avoid that neon's ne_request_destroy() is called with a NULL ptr. --- diff --git a/audacious-plugins-2.1-neon-request.patch b/audacious-plugins-2.1-neon-request.patch new file mode 100644 index 0000000..49e7298 --- /dev/null +++ b/audacious-plugins-2.1-neon-request.patch @@ -0,0 +1,14 @@ +diff -Nur audacious-plugins-fedora-2.1-prep/src/neon/neon.c audacious-plugins-fedora-2.1-neon/src/neon/neon.c +--- audacious-plugins-fedora-2.1-prep/src/neon/neon.c 2009-07-07 00:40:36.000000000 +0200 ++++ audacious-plugins-fedora-2.1-neon/src/neon/neon.c 2009-12-17 23:06:01.000000000 +0100 +@@ -1345,7 +1345,9 @@ + kill_reader(h); + } + +- ne_request_destroy(h->request); ++ if (NULL != h->request) { ++ ne_request_destroy(h->request); ++ } + ne_session_destroy(h->session); + reset_rb(&h->rb); + diff --git a/audacious-plugins.spec b/audacious-plugins.spec index 07fcb4b..d88bb15 100644 --- a/audacious-plugins.spec +++ b/audacious-plugins.spec @@ -5,7 +5,7 @@ Name: audacious-plugins Version: 2.1 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Plugins for the Audacious media player Group: Applications/Multimedia URL: http://audacious-media-player.org/ @@ -45,6 +45,8 @@ Patch16: audacious-plugins-2.1-jack.patch Patch17: audacious-plugins-2.1-pulseaudio-no-drain.patch # Patch18: audacious-plugins-2.1-sid-playfix.patch +# +Patch19: audacious-plugins-2.1-neon-request.patch BuildRequires: audacious-devel >= %{aud_ver} @@ -183,6 +185,7 @@ vortex compressed files. %patch16 -p1 -b .jack %patch17 -p1 -b .no-drain %patch18 -p1 -b .sid-playfix +%patch19 -p1 -b .neon-request sed -i '\,^.SILENT:,d' buildsys.mk.in @@ -266,6 +269,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Dec 17 2009 Michael Schwendt - 2.1-26 +- Avoid that neon's ne_request_destroy() is called with a NULL ptr. + * Wed Dec 16 2009 Michael Schwendt - 2.1-25 - Patch SID plugin to remove old cruft and fix playback. - Don't drain in pulse_audio output plugin (2.2 doesn't do this anymore