rpms/audacious-plugins/F-10 audacious-plugins-1.5.1-musepack.patch, 1.3, 1.4 audacious-plugins.spec, 1.43, 1.44

[Michael Schwendt]

Author: mschwendt

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

Modified Files:
	audacious-plugins-1.5.1-musepack.patch audacious-plugins.spec 
Log Message:
* Tue Nov 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-18
- Corrupt musepack files were abel to crash Audacious.


audacious-plugins-1.5.1-musepack.patch:
 libmpc.cxx |   38 +++++++++++++++++++-------------------
 libmpc.h   |    2 +-
 2 files changed, 20 insertions(+), 20 deletions(-)

Index: audacious-plugins-1.5.1-musepack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-10/audacious-plugins-1.5.1-musepack.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- audacious-plugins-1.5.1-musepack.patch	17 Nov 2009 19:46:48 -0000	1.3
+++ audacious-plugins-1.5.1-musepack.patch	17 Nov 2009 21:40:20 -0000	1.4
@@ -1,6 +1,6 @@
 diff -Nur audacious-plugins-fedora-1.5.1-orig/src/musepack/libmpc.cxx audacious-plugins-fedora-1.5.1-musepack/src/musepack/libmpc.cxx
 --- audacious-plugins-fedora-1.5.1-orig/src/musepack/libmpc.cxx	2008-06-08 10:37:44.000000000 +0200
-+++ audacious-plugins-fedora-1.5.1-musepack/src/musepack/libmpc.cxx	2009-11-17 20:44:19.953532318 +0100
++++ audacious-plugins-fedora-1.5.1-musepack/src/musepack/libmpc.cxx	2009-11-17 22:36:54.888775246 +0100
 @@ -52,8 +52,7 @@
  static MpcDecoder   mpcDecoder   = {0};
  static TrackInfo    track        = {0};
@@ -74,7 +74,7 @@ diff -Nur audacious-plugins-fedora-1.5.1
  
              lockRelease();
  
-@@ -870,13 +867,13 @@
+@@ -870,13 +867,16 @@
      return endThread(filename, input, false);
  }
  
@@ -87,10 +87,13 @@ diff -Nur audacious-plugins-fedora-1.5.1
  
 -    unsigned status  = mpc_decoder_decode(&decoder, sampleBuffer, &vbrAcc, &vbrUpd);
 +    guint status = mpc_decoder_decode(&decoder, sampleBuffer, &vbrAcc, &vbrUpd);
++    if (status == (guint)(-1)) {
++        return status;
++    }
      copyBuffer(sampleBuffer, xmmsBuffer, status);
  
      if (pluginConfig.dynamicBitrate)
-@@ -915,12 +912,12 @@
+@@ -915,12 +915,12 @@
  
  inline static void lockAcquire()
  {


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-10/audacious-plugins.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- audacious-plugins.spec	17 Nov 2009 11:49:41 -0000	1.43
+++ audacious-plugins.spec	17 Nov 2009 21:40:20 -0000	1.44
@@ -4,7 +4,7 @@
 
 Name:           audacious-plugins
 Version:        1.5.1
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        Plugins for the Audacious media player
 Group:          Applications/Multimedia
 
@@ -287,6 +287,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Tue Nov 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-18
+- Corrupt musepack files were abel to crash Audacious.
+
 * Tue Nov 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-17
 - More cleanup in musepack plugin.