xserver: Branch 'master'
Eamon Walsh
ewalsh at kemper.freedesktop.org
Thu Feb 7 17:19:17 PST 2008
dix/dispatch.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit de16a8c53046764dbdf26a87acc5c984ef00d818
Author: Eamon Walsh <ewalsh at tycho.nsa.gov>
Date: Thu Feb 7 20:14:16 2008 -0500
XACE: Correct some protocol error values in the colormap routines.
diff --git a/dix/dispatch.c b/dix/dispatch.c
index 663bf7d..0bca441 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -2537,7 +2537,7 @@ ProcFreeColormap(ClientPtr client)
else
{
client->errorValue = stuff->id;
- return rc;
+ return (rc == BadValue) ? BadColor : rc;
}
}
@@ -2566,7 +2566,7 @@ ProcCopyColormapAndFree(ClientPtr client)
else
{
client->errorValue = stuff->srcCmap;
- return rc;
+ return (rc == BadValue) ? BadColor : rc;
}
}
@@ -2658,7 +2658,7 @@ ProcListInstalledColormaps(ClientPtr client)
xfree(preply);
rc = client->noClientException;
out:
- return (rc == BadValue) ? BadColor : rc;
+ return rc;
}
int
More information about the xorg-commit
mailing list