Merge branch 'mjtrangoni-WIP-add-cppcheck' into 3.6.x

Attributes GH PR #678: https://github.com/ArcticaProject/nx-libs/pull/678

1 files changed, 7 insertions, 12 deletions

diff --git a/nx-X11/programs/Xserver/render/render.c b/nx-X11/programs/Xserver/render/render.c
index fb9208ad1..65ca41881 100644
--- a/nx-X11/programs/Xserver/render/render.c
+++ b/nx-X11/programs/Xserver/render/render.c
@@ -1346,6 +1346,8 @@ ProcRenderCompositeGlyphs (ClientPtr client)
     {
 	listsBase = (GlyphListPtr) malloc (nlist * sizeof (GlyphListRec));
 	if (!listsBase)
+	    free(glyphsBase);
+	    free(listsBase);
 	    return BadAlloc;
     }
     buffer = (CARD8 *) (stuff + 1);
@@ -2918,9 +2920,7 @@ PanoramiXRenderFillRectangles (ClientPtr client)
 	    result = (*PanoramiXSaveRenderVector[X_RenderFillRectangles]) (client);
 	    if(result != Success) break;
 	}
-	free(extra);
     }
-
     return result;
 }
 
@@ -2979,10 +2979,9 @@ PanoramiXRenderTrapezoids(ClientPtr client)
 
 	    if(result != Success) break;
 	}
-	
-        free(extra);
     }
 
+    free(extra);
     return result;
 }
 
@@ -3038,9 +3037,8 @@ PanoramiXRenderTriangles(ClientPtr client)
 	    if(result != Success) break;
 	}
 	
-        free(extra);
     }
-
+    free(extra);
     return result;
 }
 
@@ -3092,9 +3090,8 @@ PanoramiXRenderTriStrip(ClientPtr client)
 	    if(result != Success) break;
 	}
 	
-        free(extra);
     }
-
+    free(extra);
     return result;
 }
 
@@ -3146,9 +3143,8 @@ PanoramiXRenderTriFan(ClientPtr client)
 	    if(result != Success) break;
 	}
 	
-        free(extra);
     }
-
+    free(extra);
     return result;
 }
 
@@ -3276,9 +3272,8 @@ PanoramiXRenderAddTraps (ClientPtr client)
 	    result = (*PanoramiXSaveRenderVector[X_RenderAddTraps]) (client);
 	    if(result != Success) break;
 	}
-	free(extra);
     }
-
+    free(extra);
     return result;
 }