rpms/audacious-plugins/F-12 audacious-plugins-2.1-musepack.patch, 1.4, 1.5 audacious-plugins.spec, 1.64, 1.65

[Michael Schwendt]

Author: mschwendt

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

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


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

Index: audacious-plugins-2.1-musepack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins-2.1-musepack.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- audacious-plugins-2.1-musepack.patch	17 Nov 2009 11:47:09 -0000	1.4
+++ audacious-plugins-2.1-musepack.patch	17 Nov 2009 21:54:40 -0000	1.5
@@ -1,6 +1,6 @@
 diff -Nur audacious-plugins-fedora-2.1-orig/src/musepack/libmpc.cxx audacious-plugins-fedora-2.1-musepack/src/musepack/libmpc.cxx
 --- audacious-plugins-fedora-2.1-orig/src/musepack/libmpc.cxx	2009-07-07 00:40:36.000000000 +0200
-+++ audacious-plugins-fedora-2.1-musepack/src/musepack/libmpc.cxx	2009-11-17 12:45:01.000000000 +0100
++++ audacious-plugins-fedora-2.1-musepack/src/musepack/libmpc.cxx	2009-11-17 22:47:36.984080174 +0100
 @@ -48,8 +48,7 @@
  static MpcDecoder   mpcDecoder   = {0};
  static TrackInfo    track        = {0};
@@ -11,13 +11,12 @@ diff -Nur audacious-plugins-fedora-2.1-o
  
  /*
   * VFS callback implementation, adapted from mpc_reader.c.
-@@ -301,24 +300,21 @@
+@@ -301,24 +300,19 @@
      mpcDecoder.isAlive  = true;
      mpcDecoder.isOutput = false;
      mpcDecoder.isPause  = false;
 -    threadHandle = g_thread_self();
-+    data->playing = TRUE;
-     data->set_pb_ready(data);
+-    data->set_pb_ready(data);
      decodeStream(data);
 +    data->playing = FALSE;
  }
@@ -38,11 +37,13 @@ diff -Nur audacious-plugins-fedora-2.1-o
  }
  
  static void mpcPause(InputPlayback *data, short p_Pause)
-@@ -823,7 +819,7 @@
+@@ -823,7 +817,9 @@
      lockRelease();
  
      gint counter = 2 * track.sampleFreq / 3;
 -    while (isAlive())
++    data->playing = TRUE;
++    data->set_pb_ready(data);
 +    while (isAlive() && data->playing)
      {
          if (getOffset() != -1)
@@ -73,7 +74,7 @@ diff -Nur audacious-plugins-fedora-2.1-o
  
              lockRelease();
  
-@@ -866,13 +863,13 @@
+@@ -866,13 +863,16 @@
      return endThread(filename, input, false);
  }
  
@@ -86,10 +87,13 @@ diff -Nur audacious-plugins-fedora-2.1-o
  
 -    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)
-@@ -911,12 +908,12 @@
+@@ -911,12 +911,12 @@
  
  inline static void lockAcquire()
  {
@@ -106,7 +110,7 @@ diff -Nur audacious-plugins-fedora-2.1-o
  inline static bool isAlive()
 diff -Nur audacious-plugins-fedora-2.1-orig/src/musepack/libmpc.h audacious-plugins-fedora-2.1-musepack/src/musepack/libmpc.h
 --- audacious-plugins-fedora-2.1-orig/src/musepack/libmpc.h	2009-07-07 00:40:36.000000000 +0200
-+++ audacious-plugins-fedora-2.1-musepack/src/musepack/libmpc.h	2009-11-17 12:33:49.249924868 +0100
++++ audacious-plugins-fedora-2.1-musepack/src/musepack/libmpc.h	2009-11-17 22:43:37.323774131 +0100
 @@ -123,7 +123,7 @@
  static void       lockAcquire();
  static void       lockRelease();


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- audacious-plugins.spec	17 Nov 2009 11:36:15 -0000	1.64
+++ audacious-plugins.spec	17 Nov 2009 21:54:40 -0000	1.65
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.1
-Release: 17%{?dist}
+Release: 18%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -251,6 +251,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Nov 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-18
+- Corrupt musepack files were able to crash Audacious.
+
 * Tue Nov 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-17
 - More cleanup in musepack plugin.