Merge commit '839c9693774fdb0e420391f65b8066e8bd04c591' into master-merge

[xonotic/netradiant.git] / tools / quake3 / q3map2 / brush.c

diff --git a/tools/quake3/q3map2/brush.c b/tools/quake3/q3map2/brush.c
index 7769a0c5cc4650483bb621f1e7bba07261787c01..d48089540546de331b1ccfe57f76223445415f8f 100644 (file)
--- a/tools/quake3/q3map2/brush.c
+++ b/tools/quake3/q3map2/brush.c
@@ -99,8 +99,7 @@ brush_t *AllocBrush( int numSides ){
        }
        c = (size_t)&( ( (brush_t*) 0 )->sides[ numSides ] );*/
        c = sizeof(*bb) + (numSides > 6 ? sizeof(side_t)*(numSides - 6) : 0);
-       bb = safe_malloc( c );
-       memset( bb, 0, c );
+       bb = safe_malloc0( c );
        if ( numthreads == 1 ) {
                numActiveBrushes++;
        }
@@ -830,8 +829,7 @@ void FilterStructuralBrushesIntoTree( entity_t *e, tree_t *tree ) {
 tree_t *AllocTree( void ){
        tree_t  *tree;
 
-       tree = safe_malloc( sizeof( *tree ) );
-       memset( tree, 0, sizeof( *tree ) );
+       tree = safe_malloc0( sizeof( *tree ) );
        ClearBounds( tree->mins, tree->maxs );
 
        return tree;
@@ -845,8 +843,7 @@ tree_t *AllocTree( void ){
 node_t *AllocNode( void ){
        node_t  *node;
 
-       node = safe_malloc( sizeof( *node ) );
-       memset( node, 0, sizeof( *node ) );
+       node = safe_malloc0( sizeof( *node ) );
 
        return node;
 }