Merge commit '54a2bda443aace9c00a1615af10cc1dc8b1f0cd1' into master-merge

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

diff --git a/tools/quake3/q3map2/portals.c b/tools/quake3/q3map2/portals.c
index 676fa31599df4754276c9580b5e532edd709912c..5aab9d053955c2771af2b8525f0edbf16eeb4405 100644 (file)
--- a/tools/quake3/q3map2/portals.c
+++ b/tools/quake3/q3map2/portals.c
@@ -62,8 +62,7 @@ portal_t *AllocPortal( void ){
                c_peak_portals = c_active_portals;
        }
 
-       p = safe_malloc( sizeof( portal_t ) );
-       memset( p, 0, sizeof( portal_t ) );
+       p = safe_malloc0( sizeof( portal_t ) );
 
        return p;
 }
@@ -669,7 +668,7 @@ int FloodEntities( tree_t *tree ){
        node_t      *headnode;
        entity_t    *e, *tripped;
        const char  *value;
-       int tripcount;
+       int tripcount = INT_MIN;
 
 
        headnode = tree->headnode;