File 0001-Xinput-Catch-missing-configlayout-when-del... of Package xorg-x11-server

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch of Package xorg-x11-server (Revision 59b225c22a67766beb10a608875eb8b6)

Currently displaying revision 59b225c22a67766beb10a608875eb8b6 , Show latest

>From 829037395f8b93e69a30852a95e378f78c3ccd6b Mon Sep 17 00:00:00 2001
From: Luc Verhaegen <libv@skynet.be>
Date: Wed, 12 Nov 2008 17:09:33 +0100
Subject: [PATCH] Xinput: Catch missing configlayout when deleting device.

In DeleteInputDeviceRequest (xf86Xinput.c), we access idev members
even if idev is null. This takes down the xserver hard in some cases
(kernel SIGABRT), and segfaults on other cases.
---
 hw/xfree86/common/xf86Xinput.c |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 710e787..c0b6124 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -466,17 +466,20 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
     else
         xf86DeleteInput(pInfo, 0);
 
-    /* devices added through HAL aren't in the config layout */
-    it = xf86ConfigLayout.inputs;
-    while(*it && *it != idev)
-        it++;
-
-    if (!(*it)) /* end of list, not in the layout */
+    if (idev)
     {
-        xfree(idev->driver);
-        xfree(idev->identifier);
-        xf86optionListFree(idev->commonOptions);
-        xfree(idev);
+	/* devices added through HAL aren't in the config layout */
+	it = xf86ConfigLayout.inputs;
+	while(*it && *it != idev)
+	    it++;
+
+	if (!(*it)) /* end of list, not in the layout */
+	{
+	    xfree(idev->driver);
+	    xfree(idev->identifier);
+	    xf86optionListFree(idev->commonOptions);
+	    xfree(idev);
+	}
     }
 }
 
-- 
1.5.2.4

Places

File 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch of Package xorg-x11-server (Revision 59b225c22a67766beb10a608875eb8b6)

Places