debian/changelog | 11 +++++++++--
debian/patches/.gitignore | 1 +
debian/patches/227_null_ptr_midispcur.patch | 14 ++++++++++++++
3 files changed, 24 insertions(+), 2 deletions(-)
New commits:
commit d8e24bf6634b0ef80a21ac1d1b13412d88aa7800
Author: Bryce Harrington <br...@canonical.com>
Date: Tue Mar 27 18:50:58 2012 -0700
Fix crash after connecting a bluetooth keyboard (LP: #930936)
diff --git a/debian/changelog b/debian/changelog
index 07f3208..720bf45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
-xorg-server (2:1.11.4-0ubuntu8) UNRELEASED; urgency=low
+xorg-server (2:1.11.4-0ubuntu9) UNRELEASED; urgency=low
+ [ Chase Douglas ]
* Fix crash at startup due to input option abi break (LP: #931397)
- Revert two commits from upstream 1.12 input stack
- -- Chase Douglas <chase.doug...@ubuntu.com> Fri, 23 Mar 2012 17:26:12 -0700
+ [ Bryce Harrington ]
+ * debian/patches/227_null_ptr_midispcur.patch:
+ - Check for NULL pointer before dereferencing pointer from
+ miGetDCDevice. Fixes crash after connecting a bluetooth keyboard.
+ (LP: #930936)
+
+ -- Bryce Harrington <br...@ubuntu.com> Tue, 27 Mar 2012 18:46:03 -0700
xorg-server (2:1.11.4-0ubuntu7) precise; urgency=low
diff --git a/debian/patches/.gitignore b/debian/patches/.gitignore
new file mode 100644
index 0000000..69f1bf4
--- /dev/null
+++ b/debian/patches/.gitignore
@@ -0,0 +1 @@
+!*.patch
diff --git a/debian/patches/227_null_ptr_midispcur.patch
b/debian/patches/227_null_ptr_midispcur.patch
new file mode 100644
index 0000000..6d871ee
--- /dev/null
+++ b/debian/patches/227_null_ptr_midispcur.patch
@@ -0,0 +1,14 @@
+diff -u a/mi/midispcur.c b/mi/midispcur.c
+--- a/mi/midispcur.c 2011-08-05 09:59:03.000000000 +0400
++++ b/mi/midispcur.c 2012-02-16 10:07:52.524576132 +0400
+@@ -479,6 +479,10 @@
+ GCPtr pGC;
+
+ pBuffer = miGetDCDevice(pDev, pScreen);
++
++ if (!pBuffer)
++ return FALSE;
++
+ pSave = pBuffer->pSave;
+
+ pWin = pScreen->root;
--
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/e1sci4r-0000yn...@vasks.debian.org
