andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "randr: handle RRSetCrtcConfigs request with zero configs"

Browse Source 
This reverts commit 0d01b66df9.
This commit is contained in:
Keith Packard 2011-02-23 11:16:48 -08:00
parent 93a7399370
commit 00d0b235cf
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
randr/rrcrtc.c
View File

@ -1750,6 +1750,9 @@ ProcRRSetCrtcConfigs (ClientPtr client)
screen_config.mm_width = stuff->widthInMillimeters;
screen_config.mm_height = stuff->heightInMillimeters;
if (num_configs == 0)
return Success;
output_ids = (RROutput *) (x_configs + num_configs);
/*
@ -1757,7 +1760,7 @@ ProcRRSetCrtcConfigs (ClientPtr client)
* server crtc configurations
*/
configs = calloc(num_configs, sizeof (RRCrtcConfigRec));
if (num_configs > 0 && configs == NULL)
if (!configs)
return BadAlloc;
for (i = 0; i < num_configs; i++) {
rc = RRConvertCrtcConfig(client, screen, &screen_config,
@ -1770,8 +1773,7 @@ ProcRRSetCrtcConfigs (ClientPtr client)
output_ids += x_configs[i].nOutput;
}
if (num_configs &&
!RRSetCrtcConfigs (screen, &screen_config, configs, num_configs))
if (!RRSetCrtcConfigs (screen, &screen_config, configs, num_configs))
{
rep.status = RRSetConfigFailed;
goto sendReply;