Drawable.c: fix logic broken by scope cleanup

xp must be declared outside the while loop! xp was reset in each interation despite being increased at the iteration's end! To protect against this happening again replace the while loop by a for loop that references xp. Bug introduced by d94f4727

Drawable.c: fix logic broken by scope cleanup
fbfef7e6 · Ulrich Sibiller · 32b64d7d · fbfef7e6
Commit fbfef7e6 authored Jan 08, 2020 by Ulrich Sibiller
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

Drawable.c nx-X11/programs/Xserver/hw/nxagent/Drawable.c +3 -5

No files found.
--- a/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Drawable.c
@@ -2261,11 +2261,11 @@ void nxagentPointsToDirtyRegion(DrawablePtr pDrawable, int mode,
 {
  RegionPtr pRegion = RegionCreate(NullBox, 1);

-  int np = nPoints;
-  while (np--)
+  xPoint *xp = pPoints;
+
+  for (int np = nPoints; np--; xp++)
  {
    BoxRec box;
-    xPoint *xp = pPoints;

    if (CoordModePrevious)
    {
@@ -2294,8 +2294,6 @@ void nxagentPointsToDirtyRegion(DrawablePtr pDrawable, int mode,
    RegionUnion(pRegion, pRegion, &tmpRegion);

    RegionUninit(&tmpRegion);
-
-    xp++;
  }

  BoxRec extents = *RegionExtents(pRegion);