rpms/audacious-plugins/F-12 audacious-plugins-2.2-neon-session-destroy.patch, NONE, 1.1 audacious-plugins.spec, 1.82, 1.83

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8502

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.2-neon-session-destroy.patch 
Log Message:
sync with patches up to -13 from Rawhide

audacious-plugins-2.2-neon-session-destroy.patch:
 neon.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE audacious-plugins-2.2-neon-session-destroy.patch ---
It's just bad to de-couple state and NULL ptrs.

diff -Nur audacious-plugins-fedora-2.2-neon1/src/neon/neon.c audacious-plugins-fedora-2.2-neon2/src/neon/neon.c
--- audacious-plugins-fedora-2.2-neon1/src/neon/neon.c	2010-01-25 09:46:23.000000000 +0100
+++ audacious-plugins-fedora-2.2-neon2/src/neon/neon.c	2010-01-25 09:51:17.000000000 +0100
@@ -727,11 +727,13 @@
             _LEAVE 0;
         } else if (-1 == ret) {
             ne_session_destroy(handle->session);
+            handle->session = NULL;
             _LEAVE -1;
         }
 
         _DEBUG("<%p> Following redirect...", handle);
         ne_session_destroy(handle->session);
+        handle->session = NULL;
     }
 
     /*
@@ -945,7 +947,9 @@
     }
 
     _DEBUG("<%p> Destroying session", h);
-    ne_session_destroy(h->session);
+    if (NULL != h->session) {
+        ne_session_destroy(h->session);
+    }
 
     handle_free(h);
 
@@ -1359,7 +1363,10 @@
     if (NULL != h->request) {
         ne_request_destroy(h->request);
     }
-    ne_session_destroy(h->session);
+    if (NULL != h->session) {
+        ne_session_destroy(h->session);
+        h->session = NULL;
+    }
     reset_rb(&h->rb);
 
     if (0 != open_handle(h, newpos)) {


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- audacious-plugins.spec	8 Jan 2010 21:13:14 -0000	1.82
+++ audacious-plugins.spec	25 Jan 2010 09:43:42 -0000	1.83
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 10%{?dist}
+Release: 10%{?dist}.pl13
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -13,7 +13,7 @@ URL: http://audacious-media-player.org/
 # LGPLv2+: adplug, bio2jack, rocklight
 # MIT: crystalizer, dockalbumart
 # BSD: lastfm
-License: GPLv2 and GPLv2+ and LGPLv2+ and MIT and BSD
+License: GPLv2 and GPLv2+ and LGPLv2+ and MIT and BSD and GPLv3
 
 # Modified source tarball to remove problematic files.
 # Removed: aac madplug
@@ -25,7 +25,7 @@ Source1: audacious-sid.desktop
 Patch0: audacious-plugins-2.0.1-xmms-skindir.patch
 # obsolete with version upgrade: declaration conflict for jack_free
 Patch1: audacious-plugins-2.2-jack.patch
-#
+# merged upstream
 Patch2: audacious-plugins-2.2-neon-request.patch
 # merged upstream
 Patch3: audacious-plugins-2.2-cfg_db_close.patch
@@ -38,6 +38,8 @@ Patch5: audacious-plugins-2.2-alarm.patc
 Patch6: audacious-plugins-2.2-xspf-base.patch
 # merged upstream (AUDPLUG-160)
 Patch7: audacious-plugins-2.2-svis_expose.patch
+#
+Patch8: audacious-plugins-2.2-neon-session-destroy.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -175,6 +177,7 @@ in Vortex (.vtx) format.
 %patch5 -p1 -b .alarm
 %patch6 -p1 -b .xspf
 %patch7 -p1 -b .svis_expose
+%patch8 -p1 -b .neon-session-destroy
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -268,6 +271,10 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Mon Jan 25 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-10.pl13
+- In neon transport, after error handling set destroyed session
+  pointers to NULL, so vfs seek doesn't crash.
+
 * Fri Jan  8 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-10
 - In neon transport, after error handling set destroyed request
   pointers to NULL, so vfs read exits early.