diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-02 19:35:37 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-02 19:35:37 +0000 |
| commit | 8f2c5e2f41f211bed814be2889da16fc43e6f147 (patch) | |
| tree | e1f2715f63544d39302d6daa2cb0d4f53d295ebc /xorg-server/Xi | |
| parent | b404fe88bb87f42267cab4682b81f38cc442e617 (diff) | |
| parent | 314d225f3a60cc0ea63c292a2c2ffe3609e7c739 (diff) | |
| download | vcxsrv-8f2c5e2f41f211bed814be2889da16fc43e6f147.tar.gz vcxsrv-8f2c5e2f41f211bed814be2889da16fc43e6f147.tar.bz2 vcxsrv-8f2c5e2f41f211bed814be2889da16fc43e6f147.zip | |
svn merge ^/branches/released
Diffstat (limited to 'xorg-server/Xi')
| -rw-r--r-- | xorg-server/Xi/xiproperty.c | 5 |
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; |