debian/changelog | 12 ++++++--
debian/patches/166_nullptr_xinerama_keyrepeat.patch | 30 ++++++++++++++++++++
debian/patches/167_nullptr_xisbread.patch | 13 ++++++++
debian/patches/series | 2 +
4 files changed, 55 insertions(+), 2 deletions(-)
New commits:
commit 19a4a25c89a1fce8d67bc7321ff475967aec6a5e
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Wed Mar 18 23:52:54 2009 -0700
Null pointer dereference check to prevent crash on resume
diff --git a/debian/changelog b/debian/changelog
index 8d5f27d..24234c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,12 @@ xorg-server (2:1.6.0-0ubuntu3) UNRELEASED; urgency=low
- Avoids null pointer dereference when holding down keys on
non-primary screen when using TwinView / Xinerama on -nvidia.
(LP: #324465)
+ * Add 167_nullptr_xisbread.patch:
+ - Avoids null pointer dereference in XisbRead to prevent a (difficult
+ to reproduce) crash during or after a resume from RAM.
+ (LP: #324368)
- -- Bryce Harrington <br...@ubuntu.com> Wed, 18 Mar 2009 23:30:58 -0700
+ -- Bryce Harrington <br...@ubuntu.com> Wed, 18 Mar 2009 23:49:41 -0700
xorg-server (2:1.6.0-0ubuntu2) jaunty; urgency=low
diff --git a/debian/patches/167_nullptr_xisbread.patch
b/debian/patches/167_nullptr_xisbread.patch
new file mode 100644
index 0000000..38921dd
--- /dev/null
+++ b/debian/patches/167_nullptr_xisbread.patch
@@ -0,0 +1,13 @@
+diff -Nurp patched/hw/xfree86/common/xisb.c working/hw/xfree86/common/xisb.c
+--- patched/hw/xfree86/common/xisb.c 2009-02-02 21:53:58.000000000 +0100
++++ working/hw/xfree86/common/xisb.c 2009-02-02 21:55:09.000000000 +0100
+@@ -98,6 +98,9 @@ XisbRead (XISBuffer *b)
+ {
+ int ret;
+
++ if (b == NULL)
++ return -2;
++
+ if (b->current >= b->end)
+ {
+ if (b->block_duration >= 0)
diff --git a/debian/patches/series b/debian/patches/series
index fbbbc9e..bb89078 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@
164_trap-aspect-ratios.patch
165_man_xorg_conf_no_device_ident.patch
166_nullptr_xinerama_keyrepeat.patch
+167_nullptr_xisbread.patch
commit 7276db83246977cc41e5c564ee5f21c35cc5b5cc
Author: Bryce Harrington <br...@bryceharrington.org>
Date: Wed Mar 18 23:32:03 2009 -0700
Add null pointer check patch
diff --git a/debian/changelog b/debian/changelog
index e7dd7db..8d5f27d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,12 @@ xorg-server (2:1.6.0-0ubuntu3) UNRELEASED; urgency=low
- Device identifier no longer necessary in Screen section of
xorg.conf. Update man page accordingly.
(LP: #261577)
+ * Add 166_nullptr_xinerama_keyrepeat.patch:
+ - Avoids null pointer dereference when holding down keys on
+ non-primary screen when using TwinView / Xinerama on -nvidia.
+ (LP: #324465)
- -- Bryce Harrington <br...@ubuntu.com> Wed, 18 Mar 2009 21:13:09 -0700
+ -- Bryce Harrington <br...@ubuntu.com> Wed, 18 Mar 2009 23:30:58 -0700
xorg-server (2:1.6.0-0ubuntu2) jaunty; urgency=low
diff --git a/debian/patches/166_nullptr_xinerama_keyrepeat.patch
b/debian/patches/166_nullptr_xinerama_keyrepeat.patch
new file mode 100644
index 0000000..75dbf5d
--- /dev/null
+++ b/debian/patches/166_nullptr_xinerama_keyrepeat.patch
@@ -0,0 +1,30 @@
+From f0ef98d8d54f5dfa3081b62ff672e0fe992b0a01 Mon Sep 17 00:00:00 2001
+From: Bryce Harrington <br...@bryceharrington.org>
+Date: Wed, 18 Mar 2009 23:28:51 -0700
+Subject: [PATCH] Check for null pointer dereference to prevent crash
+ on non-primary Xinerama screens when key repeating.
+ (LP: #324465)
+
+Signed-off-by: Bryce Harrington <br...@bryceharrington.org>
+---
+ mi/mipointer.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/mi/mipointer.c b/mi/mipointer.c
+index e37316e..fe5947f 100644
+--- a/mi/mipointer.c
++++ b/mi/mipointer.c
+@@ -306,6 +306,10 @@ miPointerWarpCursor (DeviceIntPtr pDev, ScreenPtr
pScreen, int x, int y)
+ pPointer = MIPOINTER(pDev);
+ SetupScreen (pScreen);
+
++ /* Null pointer causes crash on keyrepeat with Xinerama LP: (#324465) */
++ if (pPointer == NULL)
++ return;
++
+ if (pPointer->pScreen != pScreen)
+ {
+ (*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, TRUE);
+--
+1.6.0.4
+
diff --git a/debian/patches/series b/debian/patches/series
index a9d7a8d..fbbbc9e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,3 +22,4 @@
163_thinko_in_xf86targetpreferred.patch
164_trap-aspect-ratios.patch
165_man_xorg_conf_no_device_ident.patch
+166_nullptr_xinerama_keyrepeat.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
