summaryrefslogtreecommitdiff
path: root/dix
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2009-09-03 14:17:14 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2009-09-03 14:19:35 +1000
commitf04fe06ae244b851b38be824b1a80f2f8a030591 (patch)
tree3854ad541b34c6af8b1c66625ff1d3d7e14f86bf /dix
parent84eb4c66a4a09c360cef260fb2f35dfb6d8a93c6 (diff)
dix: don't return BadMatch from GetProperty (#23562)
dixLookupWindow may return BadMatch if the window in question isn't actually a window. In this case, GetProperty needs to return BadWindow - not BadMatch. X.Org Bug 23562 <http://bugs.freedesktop.org/show_bug.cgi?id=23562> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'dix')
-rw-r--r--dix/property.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dix/property.c b/dix/property.c
index 10b8482b4..9ec5dc6ae 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -474,7 +474,7 @@ ProcGetProperty(ClientPtr client)
}
rc = dixLookupWindow(&pWin, stuff->window, client, win_mode);
if (rc != Success)
- return rc;
+ return (rc == BadMatch) ? BadWindow : rc;
if (!ValidAtom(stuff->property))
{