[PATCH v2] Xi: don't crash when deleting invalid device properties.

Peter Hutterer peter.hutterer at who-t.net
Sun Nov 22 19:07:56 PST 2009

Deleting a property that was not set on a device leads to a null-pointer
reference. The protocol allows deleting those properties - it has to be a

xinput --set-prop "My device" --type=int --format=8 "my property" 1
xinput --delete-prop "My other device" "my property"

Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
 Xi/xiproperty.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/Xi/xiproperty.c b/Xi/xiproperty.c
index 024dc44..4821857 100644
--- a/Xi/xiproperty.c
+++ b/Xi/xiproperty.c
@@ -643,6 +643,9 @@ XIDeleteDeviceProperty (DeviceIntPtr device, Atom property, Bool fromClient)
         if (prop->propertyName == property)
+    if (!prop)
+        return Success;
     if (fromClient && !prop->deletable)
         return BadAccess;

More information about the xorg-devel mailing list