rpms/audacious-plugins/F-12 audacious-plugins-2.2-adplug-fclose.patch, NONE, 1.1 audacious-plugins-2.2-adplug-lds.patch, NONE, 1.1 audacious-plugins.spec, 1.83, 1.84
Michael Schwendt
mschwendt at fedoraproject.org
Tue Jan 26 12:36:08 UTC 2010
Author: mschwendt
Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8063
Modified Files:
audacious-plugins.spec
Added Files:
audacious-plugins-2.2-adplug-fclose.patch
audacious-plugins-2.2-adplug-lds.patch
Log Message:
* Tue Jan 26 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-10.pl14
- Fix too missing open file descriptors issue in adplug plugin.
- Guard against out-of-bounds array access in adplug .lds decoder.
audacious-plugins-2.2-adplug-fclose.patch:
adplug-xmms.cc | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE audacious-plugins-2.2-adplug-fclose.patch ---
diff -Nur audacious-plugins-fedora-2.2-orig/src/adplug/adplug-xmms.cc audacious-plugins-fedora-2.2-adplug-fclose/src/adplug/adplug-xmms.cc
--- audacious-plugins-fedora-2.2-orig/src/adplug/adplug-xmms.cc 2009-11-22 23:49:52.000000000 +0100
+++ audacious-plugins-fedora-2.2-adplug-fclose/src/adplug/adplug-xmms.cc 2010-01-26 13:10:04.000000000 +0100
@@ -683,6 +683,7 @@
return NULL;
CPlayer *p = factory (fd, &tmpopl);
+ aud_vfs_fclose(fd);
if (p)
{
@@ -771,6 +772,7 @@
dbg_printf ("error!\n");
// MessageBox("AdPlug :: Error", "File could not be opened!", "Ok");
plr.playing = false;
+ aud_vfs_fclose(fd);
return (NULL);
}
audacious-plugins-2.2-adplug-lds.patch:
lds.cxx | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE audacious-plugins-2.2-adplug-lds.patch ---
Regardless of whether an input file may be broken, it must not crash
the decoder.
diff -Nur audacious-plugins-fedora-2.2-orig/src/adplug/core/lds.cxx audacious-plugins-fedora-2.2-adplug-lds/src/adplug/core/lds.cxx
--- audacious-plugins-fedora-2.2-orig/src/adplug/core/lds.cxx 2009-11-22 23:49:52.000000000 +0100
+++ audacious-plugins-fedora-2.2-adplug-lds/src/adplug/core/lds.cxx 2010-01-25 19:09:28.000000000 +0100
@@ -665,6 +665,9 @@
void
CldsPlayer::playsound (int inst_number, int channel_number, int tunehigh)
{
+ if (inst_number > numpatch-1) {
+ return;
+ }
Channel *c = &channel[channel_number]; // current channel
SoundBank *i = &soundbank[inst_number]; // current instrument
unsigned int regnum = op_table[channel_number]; // channel's OPL2 register
Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- audacious-plugins.spec 25 Jan 2010 09:43:42 -0000 1.83
+++ audacious-plugins.spec 26 Jan 2010 12:36:07 -0000 1.84
@@ -5,7 +5,7 @@
Name: audacious-plugins
Version: 2.2
-Release: 10%{?dist}.pl13
+Release: 10%{?dist}.pl14
Summary: Plugins for the Audacious media player
Group: Applications/Multimedia
URL: http://audacious-media-player.org/
@@ -40,6 +40,10 @@ Patch6: audacious-plugins-2.2-xspf-base.
Patch7: audacious-plugins-2.2-svis_expose.patch
#
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
BuildRequires: audacious-devel >= %{aud_ver}
BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -178,6 +182,8 @@ in Vortex (.vtx) format.
%patch6 -p1 -b .xspf
%patch7 -p1 -b .svis_expose
%patch8 -p1 -b .neon-session-destroy
+%patch9 -p1 -b .adplug-fclose
+%patch10 -p1 -b .lds-out-of-bounds
sed -i '\,^.SILENT:,d' buildsys.mk.in
@@ -271,6 +277,10 @@ update-desktop-database &> /dev/null ||
%changelog
+* Tue Jan 26 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-10.pl14
+- Fix too missing open file descriptors issue in adplug plugin.
+- Guard against out-of-bounds array access in adplug .lds decoder.
+
* 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.
More information about the scm-commits
mailing list