[xscreensaver] Fix segv when quitting hack with -pair option (bug 819349)
Mamoru Tasaka
mtasaka at fedoraproject.org
Mon May 7 07:13:35 UTC 2012
commit 9b83d0ee628efc8efb58b598fcc5314b3dd9eddb
Author: TASAKA Mamoru <mtasaka at localhost.localdomain>
Date: Mon May 7 16:13:30 2012 +0900
Fix segv when quitting hack with -pair option (bug 819349)
xscreensaver-5.15-pair-quit-segv.patch | 11 +++++++++++
xscreensaver.spec | 8 +++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/xscreensaver-5.15-pair-quit-segv.patch b/xscreensaver-5.15-pair-quit-segv.patch
new file mode 100644
index 0000000..eba8702
--- /dev/null
+++ b/xscreensaver-5.15-pair-quit-segv.patch
@@ -0,0 +1,11 @@
+--- xscreensaver-5.15/hacks/screenhack.c.pair 2011-09-29 05:53:31.000000000 +0900
++++ xscreensaver-5.15/hacks/screenhack.c 2012-05-07 13:05:52.207451790 +0900
+@@ -575,7 +575,7 @@
+
+ #ifdef DEBUG_PAIR
+ if (window2) ft->free_cb (dpy, window2, closure2);
+- if (window2) fps_free (fpst2);
++ if (fpst2) fps_free (fpst2);
+ #endif
+ }
+
diff --git a/xscreensaver.spec b/xscreensaver.spec
index d18d0be..f46d42c 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -10,7 +10,7 @@
%define split_getimage 1
%endif
-%define fedora_rel 5
+%define fedora_rel 6
%undefine extrarel
@@ -70,6 +70,8 @@ Patch33: xscreensaver-5.15-webcollage-chomp-getimagefile.patch
# Make vidwhacker work correctly when xscreensaver-getimage-file
# returns relative path (bug 746847)
Patch34: xscreensaver-5.15-vidwhacker-with-relative-path.patch
+# With -pair option, quitting hack will cause segv (bug 819349)
+Patch35: xscreensaver-5.15-pair-quit-segv.patch
#
# driver/test-passwd tty segfaults
Patch41: xscreensaver-5.12-test-passwd-segv-tty.patch
@@ -266,6 +268,7 @@ This package contains some test programs to debug XScreenSaver.
%patch32 -p1 -b .dpmsoff_japo
%patch33 -p1 -b .chomp
%patch34 -p1 -b .relative
+%patch35 -p1 -b .pair
%patch41 -p1 -b .test_passwd
%patch42 -p1 -b .test_misc
@@ -794,6 +797,9 @@ exit 0
%defattr(-,root,root,-)
%changelog
+* Mon May 7 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.15-6
+- Fix segv when quitting hack with -pair option (bug 819349)
+
* Fri Jan 13 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1:5.15-5
- F-17: rebuild against fixed rpm (for perl dependency generation)
More information about the scm-commits
mailing list