Revert "randr: handle RRSetCrtcConfigs request with zero configs"
This reverts commit 0d01b66df9
.
This commit is contained in:
parent
93a7399370
commit
00d0b235cf
|
@ -1750,6 +1750,9 @@ ProcRRSetCrtcConfigs (ClientPtr client)
|
||||||
screen_config.mm_width = stuff->widthInMillimeters;
|
screen_config.mm_width = stuff->widthInMillimeters;
|
||||||
screen_config.mm_height = stuff->heightInMillimeters;
|
screen_config.mm_height = stuff->heightInMillimeters;
|
||||||
|
|
||||||
|
if (num_configs == 0)
|
||||||
|
return Success;
|
||||||
|
|
||||||
output_ids = (RROutput *) (x_configs + num_configs);
|
output_ids = (RROutput *) (x_configs + num_configs);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1757,7 +1760,7 @@ ProcRRSetCrtcConfigs (ClientPtr client)
|
||||||
* server crtc configurations
|
* server crtc configurations
|
||||||
*/
|
*/
|
||||||
configs = calloc(num_configs, sizeof (RRCrtcConfigRec));
|
configs = calloc(num_configs, sizeof (RRCrtcConfigRec));
|
||||||
if (num_configs > 0 && configs == NULL)
|
if (!configs)
|
||||||
return BadAlloc;
|
return BadAlloc;
|
||||||
for (i = 0; i < num_configs; i++) {
|
for (i = 0; i < num_configs; i++) {
|
||||||
rc = RRConvertCrtcConfig(client, screen, &screen_config,
|
rc = RRConvertCrtcConfig(client, screen, &screen_config,
|
||||||
|
@ -1770,8 +1773,7 @@ ProcRRSetCrtcConfigs (ClientPtr client)
|
||||||
output_ids += x_configs[i].nOutput;
|
output_ids += x_configs[i].nOutput;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (num_configs &&
|
if (!RRSetCrtcConfigs (screen, &screen_config, configs, num_configs))
|
||||||
!RRSetCrtcConfigs (screen, &screen_config, configs, num_configs))
|
|
||||||
{
|
{
|
||||||
rep.status = RRSetConfigFailed;
|
rep.status = RRSetConfigFailed;
|
||||||
goto sendReply;
|
goto sendReply;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user