[xscreensaver/f13/master] - Fix SIGFPE on wormhole with some window size (bug 665752)

[Mamoru Tasaka]

commit 51be3eb6c0d66c03d268d5b6c3c1e92f2ee6da54
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Mon Dec 27 03:03:46 2010 +0900

    - Fix SIGFPE on wormhole with some window size (bug 665752)

 xscreensaver-5.12-wormhole-fpe.patch |   10 ++++++++++
 xscreensaver.spec                    |    7 ++++++-
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/xscreensaver-5.12-wormhole-fpe.patch b/xscreensaver-5.12-wormhole-fpe.patch
new file mode 100644
index 0000000..36c08fb
--- /dev/null
+++ b/xscreensaver-5.12-wormhole-fpe.patch
@@ -0,0 +1,10 @@
+--- xscreensaver-5.12/hacks/wormhole.c.fpe	2010-05-24 15:19:48.000000000 +0900
++++ xscreensaver-5.12/hacks/wormhole.c	2010-12-27 02:54:36.000000000 +0900
+@@ -88,6 +88,7 @@
+ /*inline*/ static int rnd( int q )
+ {
+ 
++	if (q < 1) q = 1;
+ 	return random() % q;
+ 
+ }
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 67dacc4..fd41919 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -5,7 +5,7 @@
 
 
 %define modular_conf  1
-%define fedora_rel    7
+%define fedora_rel    8
 
 %undefine extrarel
 
@@ -73,6 +73,8 @@ Patch35:         xscreensaver-5.12-gtkspinbox-page-size-to-zero.patch
 # Warn (not say "Error") about missing image directory, and warn
 # only once (bug 648304)
 Patch36:         xscreensaver-5.12-warn-only-once-with-missing-image-dir.patch
+# wormhole causes SIGFPE with some size of window (bug 665752)
+Patch37:         xscreensaver-5.12-wormhole-fpe.patch
 # Patches end
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
@@ -754,6 +756,9 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Dec 27 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.12-8
+- Fix SIGFPE on wormhole with some window size (bug 665752)
+
 * Thu Nov 11 2010 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.12-7
 - Warn (not say "Error") about missing image directory, and warn
   only once (bug 648304)