debian/changelog | 7 +
debian/patches/169_mipointer_nullptr_checks.patch | 125 ----------------------
debian/patches/series | 1
3 files changed, 7 insertions(+), 126 deletions(-)
New commits:
commit ae726f301e2b317271283b9be534338d33169b97
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Thu Mar 3 10:30:52 2011 +0200
Remove 169_mipointer_nullptr_checks.patch, fixed in another way upstream
since 1.6.1.901.
diff --git a/debian/changelog b/debian/changelog
index b919985..85d1d3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.9.99.902-2ubuntu2) UNRELEASED; urgency=low
+
+ * Remove 169_mipointer_nullptr_checks.patch, fixed in another way
+ upstream since 1.6.1.901.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 25 Feb 2011 13:17:15 +0200
+
xorg-server (2:1.9.99.902-2ubuntu1) natty; urgency=low
[ Christopher James Halse Rogers ]
diff --git a/debian/patches/169_mipointer_nullptr_checks.patch
b/debian/patches/169_mipointer_nullptr_checks.patch
deleted file mode 100644
index ed5fa7e..0000000
--- a/debian/patches/169_mipointer_nullptr_checks.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 179cec1d2f919d8d8096d6030b0ad9b6285dfd4d Mon Sep 17 00:00:00 2001
-From: Bryce Harrington <br...@bryceharrington.org>
-Date: Mon, 23 Mar 2009 14:25:18 -0700
-Subject: [PATCH] Check null pointers to not crash on keyrepeat with Xinerama
LP: (#324465)
-
-With -nvidia, when using Xinerama, holding down a key in a text field
-on a non-primary screen can cause an X crash. This is caused because
-the MIPOINTER(pDev) can return a NULL pointer for a non-null pDev in
-some cases, and the mipointer.c code lacks checks for this condition.
-
-MIPOINTER() is a macro #defined locally to mipointer.c, which calls into
-dixLookupPrivate(), a routine which returns NULL in at least some
-circumstances - such as if the memory could not be xcalloc'd for
-whatever reason. Hopefully upstream can provide a better fix for this,
-but for now it seems reasonable to check the return values of this macro
-for NULL before usage, as a minimum.
-
-UPDATE: (Dec 3, 2009) Refreshed for xserver 1.7
-
-Signed-off-by: Bryce Harrington <br...@bryceharrington.org>
----
- mi/mipointer.c | 38 ++++++++++++++++++++++++++++++++++++--
- 1 files changed, 36 insertions(+), 2 deletions(-)
-
---- a/mi/mipointer.c
-+++ b/mi/mipointer.c
-@@ -139,6 +139,10 @@ miPointerCloseScreen (int index, ScreenP
- if (DevHasCursor(pDev))
- {
- pPointer = MIPOINTER(pDev);
-+ if (pPointer == NULL) {
-+ ErrorF("miPointerCloseScreen: Invalid input device
pointer\n");
-+ return FALSE;
-+ }
-
- if (pScreen == pPointer->pScreen)
- pPointer->pScreen = 0;
-@@ -191,6 +195,10 @@ miPointerDisplayCursor (DeviceIntPtr pDe
- return FALSE;
-
- pPointer = MIPOINTER(pDev);
-+ if (pPointer == NULL) {
-+ ErrorF("miPointerDisplayCursor: Invalid input device pointer\n");
-+ return FALSE;
-+ }
-
- pPointer->pCursor = pCursor;
- pPointer->pScreen = pScreen;
-@@ -204,6 +212,10 @@ miPointerConstrainCursor (DeviceIntPtr p
- miPointerPtr pPointer;
-
- pPointer = MIPOINTER(pDev);
-+ if (pPointer == NULL) {
-+ ErrorF("miPointerConstrainCursor: Invalid input device pointer\n");
-+ return FALSE;
-+ }
-
- pPointer->limits = *pBox;
- pPointer->confined = PointerConfinedToScreen(pDev);
-@@ -310,6 +322,11 @@ miPointerWarpCursor (DeviceIntPtr pDev,
- if (pPointer == NULL)
- return;
-
-+ if (pPointer == NULL) {
-+ ErrorF("miPointerWarpCursor: Invalid input device pointer\n");
-+ return;
-+ }
-+
- if (pPointer->pScreen != pScreen)
- {
- (*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, TRUE);
-@@ -370,6 +387,10 @@ miPointerUpdateSprite (DeviceIntPtr pDev
- return;
-
- pPointer = MIPOINTER(pDev);
-+ if (pPointer == NULL) {
-+ ErrorF("miPointerUpdateSprite: Invalid input device pointer\n");
-+ return;
-+ }
-
- if (!pPointer)
- return;
-@@ -440,13 +461,17 @@ miPointerSetScreen(DeviceIntPtr pDev, in
- ScreenPtr pScreen;
- miPointerPtr pPointer;
-
-- pPointer = MIPOINTER(pDev);
--
- pScreen = screenInfo.screens[screen_no];
- pScreenPriv = GetScreenPrivate (pScreen);
- (*pScreenPriv->screenFuncs->NewEventScreen) (pDev, pScreen, FALSE);
- NewCurrentScreen (pDev, pScreen, x, y);
-
-+ pPointer = MIPOINTER(pDev);
-+ if (pPointer == NULL) {
-+ ErrorF("miPointerSetScreen: Invalid input device pointer\n");
-+ return;
-+ }
-+
- pPointer->limits.x2 = pScreen->width;
- pPointer->limits.y2 = pScreen->height;
- }
-@@ -473,6 +498,10 @@ miPointerMoved (DeviceIntPtr pDev, Scree
- SetupScreen(pScreen);
-
- pPointer = MIPOINTER(pDev);
-+ if (pPointer == NULL) {
-+ ErrorF("miPointerMoved: Invalid input device pointer\n");
-+ return;
-+ }
-
- /* Hack: We mustn't call into ->MoveCursor for anything but the
- * VCP, as this may cause a non-HW rendered cursor to be rendered during
-@@ -502,6 +531,11 @@ miPointerSetPosition(DeviceIntPtr pDev,
- miPointerPtr pPointer;
-
- pPointer = MIPOINTER(pDev);
-+ if (pPointer == NULL) {
-+ ErrorF("miPointerSetPosition: Invalid input device pointer\n");
-+ return;
-+ }
-+
- pScreen = pPointer->pScreen;
- if (!pScreen)
- return; /* called before ready */
diff --git a/debian/patches/series b/debian/patches/series
index a4840a3..4e92da1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,7 +20,6 @@
166_nullptr_xinerama_keyrepeat.patch
167_nullptr_xisbread.patch
168_glibc_trace_to_stderr.patch
-169_mipointer_nullptr_checks.patch
172_cwgetbackingpicture_nullptr_check.patch
188_default_primary_to_first_busid.patch
190_cache-xkbcomp_output_for_fast_start_up.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/e1pv3x0-0002tt...@alioth.debian.org
