[PATCH xserver 1/2] modesetting: Don't reuse iterator in nested loop

Daniel Stone daniels at collabora.com
Thu Apr 5 13:58:40 UTC 2018


drmmode_crtc_set_mode has a loop nested inside another loop, where both
of them were using 'i' as the loop iterator. Rename it to avoid an
infinite loop.

Signed-off-by: Daniel Stone <daniels at collabora.com>
Reported-by: Michel Dänzer <michel.daenzer at amd.com>
---
 hw/xfree86/drivers/modesetting/drmmode_display.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index 0eacefba2..f5f9fa582 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -778,12 +778,13 @@ drmmode_crtc_set_mode(xf86CrtcPtr crtc, Bool test_only)
             drmmode_crtc_private_ptr other_drmmode_crtc = other_crtc->driver_private;
             int lost_outputs = 0;
             int remaining_outputs = 0;
+	    int j;
 
             if (other_crtc == crtc)
                 continue;
 
-            for (i = 0; i < xf86_config->num_output; i++) {
-                xf86OutputPtr output = xf86_config->output[i];
+            for (j = 0; i < xf86_config->num_output; j++) {
+                xf86OutputPtr output = xf86_config->output[j];
                 drmmode_output_private_ptr drmmode_output = output->driver_private;
 
                 if (drmmode_output->current_crtc == other_crtc) {
-- 
2.17.0



More information about the xorg-devel mailing list