randr: handle RRSetCrtcConfigs request with zero configs

Need to actually return a reply in this case. Signed-off-by: Keith Packard <[email protected]> Reviewed-by: Aaron Plattner <[email protected]>
juergbi · Dec 7, 2010 · 0d01b66 · 0d01b66
1 parent b0f4bd6
commit 0d01b66
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c
@@ -1750,17 +1750,14 @@ 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);
 
     /*
      * Convert protocol crtc configurations into
      * server crtc configurations
      */
     configs = calloc(num_configs, sizeof (RRCrtcConfigRec));
-    if (!configs)
+    if (num_configs > 0 && configs == NULL)
 	return BadAlloc;
     for (i = 0; i < num_configs; i++) {
 	rc = RRConvertCrtcConfig(client, screen, &screen_config,
@@ -1773,7 +1770,8 @@ ProcRRSetCrtcConfigs (ClientPtr client)
 	output_ids += x_configs[i].nOutput;
     }
 
-    if (!RRSetCrtcConfigs (screen, &screen_config, configs, num_configs))
+    if (num_configs &&
+	!RRSetCrtcConfigs (screen, &screen_config, configs, num_configs))
     {
 	rep.status = RRSetConfigFailed;
 	goto sendReply;