Merge lp:~pitti/kubuntu-default-settings/fix-345269 into lp:kubuntu-default-settings

[Martin Pitt]

[Martin Pitt (pitti)]

https://bugs.edge.launchpad.net/ubuntu/jaunty/+source/xubuntu-artwork/+bug/345269

already uploaded.

=== modified file 'debian/changelog'
--- debian/changelog	2009-03-19 17:21:37 +0000
+++ debian/changelog	2009-03-19 21:18:16 +0000
@@ -1,3 +1,12 @@
+kubuntu-default-settings (1:9.04.23) jaunty; urgency=low
+
+  * usplash/usplash-theme-kubuntu.c, t_animate_step_{16,32}: Use the correct
+    image's width for calculating the number of pulsating steps. Previously,
+    this triggered integer, and thus buffer overflows, which caused screen
+    corruption and sometimes complete corruption of the VTs. (LP: #345269)
+
+ -- Martin Pitt <[e-mail]>  Thu, 19 Mar 2009 22:11:47 +0100
+
 kubuntu-default-settings (1:9.04.22) jaunty; urgency=low
 
   [ Aurélien Gâteau ]

=== modified file 'usplash/usplash-theme-kubuntu.c'
--- usplash/usplash-theme-kubuntu.c	2009-03-18 16:03:17 +0000
+++ usplash/usplash-theme-kubuntu.c	2009-03-19 21:11:44 +0000
@@ -928,7 +928,7 @@
     static int num_steps = 0;
     int x1;
     int x2;
-    num_steps = (pixmap_throbber_fore.width - pulse_width)/2;
+    num_steps = (pixmap_throbber_fore_16.width - pulse_width)/2;
 
     if (pulsating) {
         if(pulsate_step < num_steps/2+1){
@@ -961,7 +961,7 @@
     static int num_steps = 0;
     int x1;
     int x2;
-    num_steps = (pixmap_throbber_fore.width - pulse_width)/2;
+    num_steps = (pixmap_throbber_fore_32.width - pulse_width)/2;
 
     if (pulsating) {
         if(pulsate_step < num_steps/2+1){