rpms/audacious-plugins/F-12 audacious-plugins-2.2-svis_expose.patch, NONE, 1.1 audacious-plugins.spec, 1.79, 1.80

[Michael Schwendt]

Author: mschwendt

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

Modified Files:
	audacious-plugins.spec 
Added Files:
	audacious-plugins-2.2-svis_expose.patch 
Log Message:
sync with Rawhide

audacious-plugins-2.2-svis_expose.patch:
 ui_svis.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE audacious-plugins-2.2-svis_expose.patch ---
diff -Nur audacious-plugins-2.2-orig/src/skins/ui_svis.c audacious-plugins-2.2-551801/src/skins/ui_svis.c
--- audacious-plugins-2.2-orig/src/skins/ui_svis.c	2009-11-22 23:49:53.000000000 +0100
+++ audacious-plugins-2.2-551801/src/skins/ui_svis.c	2010-01-02 14:58:56.146988246 +0100
@@ -354,7 +354,7 @@
               for(x=0;x< SVIS_WIDTH; x++){
                 if(svis->data[x] > y << 1)
                 {
-                  ptr = rgb_data + x * 6 + (SVIS_HEIGHT * 2 - y * 2) * SVIS_WIDTH *2;
+                  ptr = rgb_data + x * 6 + (SVIS_HEIGHT-y) * SVIS_WIDTH *2;
                   DRAW_DS_PIXEL(ptr, 23);
                   DRAW_DS_PIXEL(ptr + 2, 23);
                 }
@@ -364,7 +364,7 @@
               for(x=0;x< SVIS_WIDTH; x++){
                 if(svis->data[x] > y << 1)
                 {
-                  ptr = rgb_data + x * 2 + (SVIS_HEIGHT * 2 - y * 2) * SVIS_WIDTH * 2;
+                  ptr = rgb_data + x * 2 + (SVIS_HEIGHT-y) * SVIS_WIDTH * 2;
                   DRAW_DS_PIXEL(ptr, 23);
                 }
               }


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- audacious-plugins.spec	31 Dec 2009 13:50:30 -0000	1.79
+++ audacious-plugins.spec	2 Jan 2010 14:04:02 -0000	1.80
@@ -5,7 +5,7 @@
 
 Name: audacious-plugins
 Version: 2.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -35,6 +35,8 @@ Patch4: audacious-plugins-2.2-bluetooth.
 Patch5: audacious-plugins-2.2-alarm.patch
 #
 Patch6: audacious-plugins-2.2-xspf-base.patch
+# submitted upstream
+Patch7: audacious-plugins-2.2-svis_expose.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -171,6 +173,7 @@ in Vortex (.vtx) format.
 %patch4 -p1 -b .bluetooth
 %patch5 -p1 -b .alarm
 %patch6 -p1 -b .xspf
+%patch7 -p1 -b .svis_expose
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -265,6 +268,9 @@ update-desktop-database &> /dev/null || 
 
 
 %changelog
+* Sat Jan  2 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-8
+- Fix stack smashing in ui_svis_expose (#551801).
+
 * Thu Dec 31 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-7
 - Fix xspf Container plugin's handling of plain file names.
 - Disable modplug plugin (where is it compared with libmodplug and