[xscreensaver] Fix engine crash with one byte ahead access (bug 954115)

[Mamoru Tasaka]

commit daf041a646f5dfd063210c7fda32fd0a8a17d080
Author: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date:   Sun Apr 21 21:26:14 2013 +0900

    Fix engine crash with one byte ahead access (bug 954115)

 xscreensaver-5.21-engine-onebytefix.patch |   19 +++++++++++++++++++
 xscreensaver.spec                         |    8 +++++++-
 2 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/xscreensaver-5.21-engine-onebytefix.patch b/xscreensaver-5.21-engine-onebytefix.patch
new file mode 100644
index 0000000..e1759a6
--- /dev/null
+++ b/xscreensaver-5.21-engine-onebytefix.patch
@@ -0,0 +1,19 @@
+--- xscreensaver-5.21/hacks/glx/engine.c.onebyte	2012-10-07 03:43:06.000000000 +0900
++++ xscreensaver-5.21/hacks/glx/engine.c	2013-04-21 21:21:28.000000000 +0900
+@@ -284,13 +284,13 @@
+   float f;
+ 
+   f = ONEREV / (M_PI * 2);
+-  for (i = 0 ; i <= TWOREV ; i++) {
++  for (i = 0 ; i < TWOREV ; i++) {
+     e->sin_table[i] = sin(i/f);
+   }
+-  for (i = 0 ; i <= TWOREV ; i++) {
++  for (i = 0 ; i < TWOREV ; i++) {
+     e->cos_table[i] = cos(i/f);
+   }
+-  for (i = 0 ; i <= TWOREV ; i++) {
++  for (i = 0 ; i < TWOREV ; i++) {
+     e->tan_table[i] = tan(i/f);
+   }
+ }
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 1978619..82e0bcf 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    3
+%define fedora_rel    4
 
 %undefine extrarel
 
@@ -70,6 +70,8 @@ Patch33:         xscreensaver-5.21-bumps-size.patch
 Patch34:         xscreensaver-5.21-polyominoes-array-bounds.patch
 # Convert maxlife option from 5.20- for fireworkx (bug 953916)
 Patch35:         xscreensaver-5.21-fireworkx-transit.patch
+# Fix engine crash with one byte ahead access (bug 954115)
+Patch36:         xscreensaver-5.21-engine-onebytefix.patch
 # driver/test-passwd tty segfaults
 Patch51:         xscreensaver-5.12-test-passwd-segv-tty.patch
 # patch to compile driver/test-xdpms
@@ -269,6 +271,7 @@ This package contains some test programs to debug XScreenSaver.
 %patch33 -p1 -b .bumps_size
 %patch34 -p1 -b .polyominoes_arraybounds
 %patch35 -p1 -b .fireworkx.transit
+%patch36 -p1 -b .engine_onebyte
 %patch51 -p1 -b .test_passwd
 %patch52 -p1 -b .test_misc
 %patch100 -p1 -b .rpmver
@@ -826,6 +829,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Sun Apr 21 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.21-4
+- Fix engine crash with one byte ahead access (bug 954115)
+
 * Sun Apr 21 2013 Mamoru TASAKA <mtasaka at fedoraproject.org> - 1:5.21-3
 - Fix the iteration number for pentomino mode in polyominoes
   (bug 954077)