1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00

Fix a race condition in mouse device.

PR:		ports/29982
Submitted by:	Michael Robinson <robinson@netrinsics.com>
This commit is contained in:
Jean-Marc Zucconi 2001-08-23 22:36:49 +00:00
parent 63a08ea3d4
commit 11377e20a2
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=46754
2 changed files with 23 additions and 1 deletions

View File

@ -7,7 +7,7 @@
PORTNAME= XFree86
PORTVERSION= 4.1.0
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= 4.1.0

View File

@ -0,0 +1,22 @@
--- programs/Xserver/hw/xfree86/input/mouse/mouse.c.orig Sat Aug 18 22:47:30 2001
+++ programs/Xserver/hw/xfree86/input/mouse/mouse.c Thu Aug 23 17:13:44 2001
@@ -1837,8 +1837,6 @@
if ((id = stateTab[pMse->emulateState][4][0]) != 0) {
xf86PostButtonEvent(pInfo->dev, 0, abs(id), (id >= 0), 0, 0);
pMse->emulateState = stateTab[pMse->emulateState][4][2];
- } else {
- ErrorF("Got unexpected buttonTimer in state %d\n", pMse->emulateState);
}
xf86UnblockSIGIO (sigstate);
@@ -1892,11 +1890,6 @@
if (stateTab[pMse->emulateState][4][0] != 0) {
timer = TimerSet(timer, 0, pMse->emulate3Timeout, buttonTimer,
pInfo);
- } else {
- if (timer) {
- TimerFree(timer);
- timer = NULL;
- }
}
}