aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/Xi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-12-02 17:33:15 +0000
committermarha <marha@users.sourceforge.net>2009-12-02 17:33:15 +0000
commit314d225f3a60cc0ea63c292a2c2ffe3609e7c739 (patch)
tree181562a86ee74db9182bd9b60d258d3fed6642ee /xorg-server/Xi
parent4ac4a5b7ce8cc8f195d69a42da10d386eaa5c056 (diff)
downloadvcxsrv-314d225f3a60cc0ea63c292a2c2ffe3609e7c739.tar.gz
vcxsrv-314d225f3a60cc0ea63c292a2c2ffe3609e7c739.tar.bz2
vcxsrv-314d225f3a60cc0ea63c292a2c2ffe3609e7c739.zip
Xserver git update
Diffstat (limited to 'xorg-server/Xi')
-rw-r--r--xorg-server/Xi/xiproperty.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/xorg-server/Xi/xiproperty.c b/xorg-server/Xi/xiproperty.c
index 024dc444b..ecb326ee3 100644
--- a/xorg-server/Xi/xiproperty.c
+++ b/xorg-server/Xi/xiproperty.c
@@ -630,6 +630,8 @@ XIDeleteAllDeviceProperties (DeviceIntPtr device)
xfree(curr_handler);
curr_handler = next_handler;
}
+
+ device->properties.handlers = NULL;
}
@@ -643,6 +645,9 @@ XIDeleteDeviceProperty (DeviceIntPtr device, Atom property, Bool fromClient)
if (prop->propertyName == property)
break;
+ if (!prop)
+ return Success;
+
if (fromClient && !prop->deletable)
return BadAccess;