Merge lp:~pitti/xubuntu-artwork/fix-345269 into lp:~xubuntu-art/xubuntu-artwork/trunk

[Martin Pitt]

[Martin Pitt (pitti)]

Fix display corruption, see https://bugs.launchpad.net/ubuntu/jaunty/+source/xubuntu-artwork/+bug/345269

It's probably much less severe than the recent regression for ubuntu/kubuntu, but it should be fixed anyway. I already uploaded the package.

=== modified file 'debian/changelog'
--- debian/changelog	2009-03-18 20:22:54 +0000
+++ debian/changelog	2009-03-19 21:42:43 +0000
@@ -1,3 +1,12 @@
+xubuntu-artwork (0.23) jaunty; urgency=low
+
+  * usplash-theme-xubuntu.c, t_animate_step_16: 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:42:34 +0100
+
 xubuntu-artwork (0.22) jaunty; urgency=low
 
   * debian/control:

=== modified file 'usplash/usplash-theme-xubuntu.c'
--- usplash/usplash-theme-xubuntu.c	2009-03-15 14:03:15 +0000
+++ usplash/usplash-theme-xubuntu.c	2009-03-19 21:42:30 +0000
@@ -364,7 +364,7 @@
     static int step_width = 2;
     static int num_steps = 0;
     int x1;
-    num_steps = (pixmap_throbber_fore.width - pulse_width)/2;
+    num_steps = (pixmap_throbber_fore_16.width - pulse_width)/2;
 
     if (pulsating) {
         t_draw_progressbar_16(theme, 0);
@@ -372,7 +372,7 @@
         if(pulsate_step < num_steps/2+1)
 	        x1 = 2 * step_width * pulsate_step;
         else
-	        x1 = pixmap_throbber_fore.width - pulse_width - 2 * step_width * (pulsate_step - num_steps/2+1);
+	        x1 = pixmap_throbber_fore_16.width - pulse_width - 2 * step_width * (pulsate_step - num_steps/2+1);
 
         usplash_put_part(theme->progressbar_x + x1, theme->progressbar_y, pulse_width,
                          pixmap_throbber_fore_16.height, &pixmap_throbber_fore_16, x1, 0);