debian/changelog | 8 ++++++++
debian/patches/109_fix-swcursor-crash.patch | 13 +++++++++++++
debian/patches/series | 1 +
3 files changed, 22 insertions(+)
New commits:
commit c249cd5040b34675edd1198261c67c7fd4c88b41
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Thu Mar 11 17:36:58 2010 -0800
Update patch number
diff --git a/debian/changelog b/debian/changelog
index f416001..dd12e3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.7.5-1ubuntu3) lucid; urgency=low
+
+ * Add 109_fix-swcursor-crash.patch: Avoid dereferencing null pointer
+ while reloading cursors during resume.
+ (LP: #371405)
+
+ -- Bryce Harrington <br...@ubuntu.com> Thu, 11 Mar 2010 17:16:12 -0800
+
xorg-server (2:1.7.5-1ubuntu2) lucid; urgency=low
[ Bryce Harrington ]
diff --git a/debian/patches/109_fix-swcursor-crash.patch
b/debian/patches/109_fix-swcursor-crash.patch
new file mode 100644
index 0000000..ec2db45
--- /dev/null
+++ b/debian/patches/109_fix-swcursor-crash.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.6.5/hw/xfree86/modes/xf86Cursors.c
+===================================================================
+--- xorg-server-1.6.5.orig/hw/xfree86/modes/xf86Cursors.c 2009-11-29
15:16:23.000000000 -0500
++++ xorg-server-1.6.5/hw/xfree86/modes/xf86Cursors.c 2009-11-29
15:16:34.000000000 -0500
+@@ -612,7 +612,7 @@
+ cursor_screen_priv = dixLookupPrivate(&screen->devPrivates,
+ xf86CursorScreenKey);
+ /* return if HW cursor is inactive, to avoid displaying two cursors */
+- if (!cursor_screen_priv->isUp)
++ if (!cursor_screen || !cursor_screen_priv->isUp)
+ return;
+
+ scrn = xf86Screens[screen->myNum];
diff --git a/debian/patches/110_fix-swcursor-crash.patch
b/debian/patches/110_fix-swcursor-crash.patch
deleted file mode 100644
index ec2db45..0000000
--- a/debian/patches/110_fix-swcursor-crash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xorg-server-1.6.5/hw/xfree86/modes/xf86Cursors.c
-===================================================================
---- xorg-server-1.6.5.orig/hw/xfree86/modes/xf86Cursors.c 2009-11-29
15:16:23.000000000 -0500
-+++ xorg-server-1.6.5/hw/xfree86/modes/xf86Cursors.c 2009-11-29
15:16:34.000000000 -0500
-@@ -612,7 +612,7 @@
- cursor_screen_priv = dixLookupPrivate(&screen->devPrivates,
- xf86CursorScreenKey);
- /* return if HW cursor is inactive, to avoid displaying two cursors */
-- if (!cursor_screen_priv->isUp)
-+ if (!cursor_screen || !cursor_screen_priv->isUp)
- return;
-
- scrn = xf86Screens[screen->myNum];
diff --git a/debian/patches/series b/debian/patches/series
index 865627b..63ca335 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,7 +18,7 @@
106_nouveau_autodetect.patch
107_dont_filter_input_subsys.diff
108_reenable_record_ext.patch
-110_fix-swcursor-crash.patch
+109_fix-swcursor-crash.patch
121_only_switch_vt_when_active.diff
#143_default_to_vesa.patch
157_check_null_modes.patch
commit dcd61b292cdcf379b911a7112425d59ad5a79ef7
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Thu Mar 11 17:14:33 2010 -0800
Add fix for segfault on swsusp resume
diff --git a/debian/patches/110_fix-swcursor-crash.patch
b/debian/patches/110_fix-swcursor-crash.patch
new file mode 100644
index 0000000..ec2db45
--- /dev/null
+++ b/debian/patches/110_fix-swcursor-crash.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.6.5/hw/xfree86/modes/xf86Cursors.c
+===================================================================
+--- xorg-server-1.6.5.orig/hw/xfree86/modes/xf86Cursors.c 2009-11-29
15:16:23.000000000 -0500
++++ xorg-server-1.6.5/hw/xfree86/modes/xf86Cursors.c 2009-11-29
15:16:34.000000000 -0500
+@@ -612,7 +612,7 @@
+ cursor_screen_priv = dixLookupPrivate(&screen->devPrivates,
+ xf86CursorScreenKey);
+ /* return if HW cursor is inactive, to avoid displaying two cursors */
+- if (!cursor_screen_priv->isUp)
++ if (!cursor_screen || !cursor_screen_priv->isUp)
+ return;
+
+ scrn = xf86Screens[screen->myNum];
diff --git a/debian/patches/series b/debian/patches/series
index 07199af..865627b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,6 +18,7 @@
106_nouveau_autodetect.patch
107_dont_filter_input_subsys.diff
108_reenable_record_ext.patch
+110_fix-swcursor-crash.patch
121_only_switch_vt_when_active.diff
#143_default_to_vesa.patch
157_check_null_modes.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1nrj1n-0006rs...@alioth.debian.org
