[xscreensaver] Prevent crash when distort receives ConfigureNotify at startup

[Mamoru Tasaka]

commit 0652a2f6a08c4453f1acdad983bb8bace29cbc12
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Tue Oct 30 23:38:29 2012 +0900

    Prevent crash when distort receives ConfigureNotify at startup
    
      (bug 871433)

 ...aver-5.20-distort-configurenotify-startup.patch |   12 ++++++++++++
 xscreensaver.spec                                  |   10 +++++++++-
 2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/xscreensaver-5.20-distort-configurenotify-startup.patch b/xscreensaver-5.20-distort-configurenotify-startup.patch
new file mode 100644
index 0000000..ea47991
--- /dev/null
+++ b/xscreensaver-5.20-distort-configurenotify-startup.patch
@@ -0,0 +1,12 @@
+--- xscreensaver-5.20/hacks/distort.c.configurenotify	2012-07-04 04:45:52.000000000 +0900
++++ xscreensaver-5.20/hacks/distort.c	2012-10-30 23:31:56.000000000 +0900
+@@ -785,6 +785,9 @@
+   XGetWindowAttributes (st->dpy, st->window, &st->xgwa);
+   /* XClearWindow (dpy, window); */
+   /* Why doesn't this work? */
++  /* st->orig_map is created at distort_finish_loading and
++     may not be initialized here */
++  if (!st->orig_map) return;
+   XPutImage (st->dpy, st->window, st->gc, st->orig_map,
+              0, 0, st->orig_map->width, st->orig_map->height, 0, 0);
+ }
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 79286ab..2745ebd 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,7 +10,7 @@
 %define split_getimage   1
 %endif
 
-%define fedora_rel    2
+%define fedora_rel    3
 
 %undefine extrarel
 
@@ -63,6 +63,9 @@ Patch30:         xscreensaver-5.11-conf264.patch
 #
 # Update Japanese po file
 Patch32:         xscreensaver-5.13-dpmsQuickoff-japo.patch
+# Prevent crash when distort receives ConfigureNotify at startup
+# (bug 871433)
+Patch33:         xscreensaver-5.20-distort-configurenotify-startup.patch
 # Add -D_FILE_OFFSET_BITS=64 when this enabled stat64
 Patch37:         xscreensaver-5.19-check-largefile-support.patch
 # driver/test-passwd tty segfaults
@@ -261,6 +264,7 @@ This package contains some test programs to debug XScreenSaver.
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
 %patch32 -p1 -b .dpmsoff_japo
+%patch33 -p1 -b .distort_startup
 %patch37 -p1 -b .large
 %patch41 -p1 -b .test_passwd
 %patch42 -p1 -b .test_misc
@@ -816,6 +820,10 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Tue Oct 30 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.20-3
+- Prevent crash when distort receives ConfigureNotify at startup
+  (bug 871433)
+
 * Wed Oct 24 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.20-2
 - Kill dependency of -gss subpackages for gnome-screensaver
   to make MATE desktop happy