Stefan Dirsch
7e6a980b1f
Copy from home:oertel:branches:openSUSE:Factory/xorg-x11-server via accept of submit request 35298 revision 8. Request was accepted with message: reviewed ok. OBS-URL: https://build.opensuse.org/request/show/35298 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xorg-x11-server?expand=0&rev=229
43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
>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.
|
|
================================================================================
|
|
--- xorg-server-1.7.99/hw/xfree86/common/xf86Xinput.c
|
|
+++ xorg-server-1.7.99/hw/xfree86/common/xf86Xinput.c
|
|
@@ -870,17 +870,20 @@
|
|
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);
|
|
+ }
|
|
}
|
|
}
|
|
OsReleaseSignals();
|