X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2Fq3map2%2Fbspfile_abstract.c;h=675aef6d3abd6d971333d720b2aa42a2649c9f64;hb=dd26dc48e9500d279343a4d700d20bc2090744c6;hp=fb8af399eddda89e06c3165cf9271cbdb5ef30ed;hpb=edf7c2f7a0986dd61d30b6e5114075fbd7a88410;p=xonotic%2Fnetradiant.git

diff --git a/tools/quake3/q3map2/bspfile_abstract.c b/tools/quake3/q3map2/bspfile_abstract.c
index fb8af399..675aef6d 100644
--- a/tools/quake3/q3map2/bspfile_abstract.c
+++ b/tools/quake3/q3map2/bspfile_abstract.c
@@ -89,9 +89,7 @@ void SetDrawVerts( int n ){
 	numBSPDrawVerts = n;
 	numBSPDrawVertsBuffer = numBSPDrawVerts;
 
-	bspDrawVerts = safe_malloc_info( sizeof( bspDrawVert_t ) * numBSPDrawVertsBuffer, "IncDrawVerts" );
-
-	memset( bspDrawVerts, 0, n * sizeof( bspDrawVert_t ) );
+	bspDrawVerts = safe_malloc0_info( sizeof( bspDrawVert_t ) * numBSPDrawVertsBuffer, "IncDrawVerts" );
 }
 
 int numBSPDrawSurfacesBuffer = 0;
@@ -102,9 +100,7 @@ void SetDrawSurfacesBuffer(){
 
 	numBSPDrawSurfacesBuffer = MAX_MAP_DRAW_SURFS;
 
-	bspDrawSurfaces = safe_malloc_info( sizeof( bspDrawSurface_t ) * numBSPDrawSurfacesBuffer, "IncDrawSurfaces" );
-
-	memset( bspDrawSurfaces, 0, MAX_MAP_DRAW_SURFS * sizeof( bspDrawSurface_t ) );
+	bspDrawSurfaces = safe_malloc0_info( sizeof( bspDrawSurface_t ) * numBSPDrawSurfacesBuffer, "IncDrawSurfaces" );
 }
 
 void SetDrawSurfaces( int n ){
@@ -115,9 +111,7 @@ void SetDrawSurfaces( int n ){
 	numBSPDrawSurfaces = n;
 	numBSPDrawSurfacesBuffer = numBSPDrawSurfaces;
 
-	bspDrawSurfaces = safe_malloc_info( sizeof( bspDrawSurface_t ) * numBSPDrawSurfacesBuffer, "IncDrawSurfaces" );
-
-	memset( bspDrawSurfaces, 0, n * sizeof( bspDrawSurface_t ) );
+	bspDrawSurfaces = safe_malloc0_info( sizeof( bspDrawSurface_t ) * numBSPDrawSurfacesBuffer, "IncDrawSurfaces" );
 }
 
 void BSPFilesCleanup(){
@@ -341,14 +335,16 @@ int CopyLump_Allocate( bspHeader_t *header, int lump, void **dest, int size, int
 void AddLump( FILE *file, bspHeader_t *header, int lumpNum, const void *data, int length ){
 	bspLump_t   *lump;
 
-
 	/* add lump to bsp file header */
 	lump = &header->lumps[ lumpNum ];
 	lump->offset = LittleLong( ftell( file ) );
 	lump->length = LittleLong( length );
 
 	/* write lump to file */
-	SafeWrite( file, data, ( length + 3 ) & ~3 );
+	SafeWrite( file, data, length );
+
+	/* write padding zeros */
+	SafeWrite( file, (const byte[3]){ 0, 0, 0 }, ( ( length + 3 ) & ~3 ) - length );
 }
 
 
@@ -497,8 +493,7 @@ epair_t *ParseEPair( void ){
 
 
 	/* allocate and clear new epair */
-	e = safe_malloc( sizeof( epair_t ) );
-	memset( e, 0, sizeof( epair_t ) );
+	e = safe_malloc0( sizeof( epair_t ) );
 
 	/* handle key */
 	if ( strlen( token ) >= ( MAX_KEY - 1 ) ) {