misc: fix more regressions and whitespace weirdness introduced in 913fcf1a74426725f14380dd5b34286a21c37ab7.

1 files changed, 19 insertions, 8 deletions

diff --git a/nx-X11/programs/Xserver/render/render.c b/nx-X11/programs/Xserver/render/render.c
index 65ca41881..3c1cbe53c 100644
--- a/nx-X11/programs/Xserver/render/render.c
+++ b/nx-X11/programs/Xserver/render/render.c
@@ -1346,9 +1346,12 @@ ProcRenderCompositeGlyphs (ClientPtr client)
     {
 	listsBase = (GlyphListPtr) malloc (nlist * sizeof (GlyphListRec));
 	if (!listsBase)
+	{
 	    free(glyphsBase);
 	    free(listsBase);
+
 	    return BadAlloc;
+	}
     }
     buffer = (CARD8 *) (stuff + 1);
     glyphs = glyphsBase;
@@ -2920,6 +2923,8 @@ PanoramiXRenderFillRectangles (ClientPtr client)
 	    result = (*PanoramiXSaveRenderVector[X_RenderFillRectangles]) (client);
 	    if(result != Success) break;
 	}
+
+	free(extra);
     }
     return result;
 }
@@ -2979,9 +2984,10 @@ PanoramiXRenderTrapezoids(ClientPtr client)
 
 	    if(result != Success) break;
 	}
+
+	free(extra);
     }
 
-    free(extra);
     return result;
 }
 
@@ -3036,9 +3042,10 @@ PanoramiXRenderTriangles(ClientPtr client)
 
 	    if(result != Success) break;
 	}
-	
+
+	free(extra);
     }
-    free(extra);
+
     return result;
 }
 
@@ -3089,9 +3096,10 @@ PanoramiXRenderTriStrip(ClientPtr client)
 
 	    if(result != Success) break;
 	}
-	
+
+	free(extra);
     }
-    free(extra);
+
     return result;
 }
 
@@ -3142,9 +3150,10 @@ PanoramiXRenderTriFan(ClientPtr client)
 
 	    if(result != Success) break;
 	}
-	
+
+	free(extra);
     }
-    free(extra);
+
     return result;
 }
 
@@ -3272,8 +3281,10 @@ PanoramiXRenderAddTraps (ClientPtr client)
 	    result = (*PanoramiXSaveRenderVector[X_RenderAddTraps]) (client);
 	    if(result != Success) break;
 	}
+
+	free(extra);
     }
-    free(extra);
+
     return result;
 }