From 6cc26fe8787fa82fbe30440bf390615057e96af6 Mon Sep 17 00:00:00 2001
From: Kevin Shanahan <kmshanah@disenchant.net>
Date: Wed, 6 Mar 2013 11:50:56 +1030
Subject: [PATCH] qbsp: numportals parm is more accurately maxleaks

It seems clearer now that the numportals parameter is actually used to
check that the number of leak portals we accumulate doesn't exceed the
allocated memory. Update the structs to reflect that.

Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
---
 qbsp/outside.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/qbsp/outside.c b/qbsp/outside.c
index 7888ae56..d38b2eec 100644
--- a/qbsp/outside.c
+++ b/qbsp/outside.c
@@ -28,6 +28,7 @@ typedef struct {
     const node_t *leaknode;	/* Node where entity was reached */
     const portal_t **leaks;
     int numleaks;
+    int maxleaks;
 } bspleak_t;
 
 typedef struct {
@@ -39,7 +40,6 @@ typedef struct {
 typedef struct {
     bool fill;
     int fillmark;
-    int numportals;
 } fillparms_t;
 
 static FILE *LeakFile;
@@ -153,14 +153,14 @@ MarkLeakTrail
 */
 __attribute__((noinline))
 static void
-MarkLeakTrail(bspleak_t *bspleak, const fillparms_t *parms, const portal_t *n2)
+MarkLeakTrail(bspleak_t *bspleak, const portal_t *n2)
 {
     int i;
     vec3_t p1, p2;
     const portal_t *n1;
     vec_t *v;
 
-    if (bspleak->numleaks > parms->numportals)
+    if (bspleak->numleaks >= bspleak->maxleaks)
 	Error(errLowLeakCount);
 
     bspleak->leaks[bspleak->numleaks++] = n2;
@@ -364,7 +364,7 @@ RecursiveFillOutside(fillstate_t *state, const fillparms_t *parms, node_t *node)
 	    if (map.leakfile || !state->backdraw)
 		return true;
 	    state->backdraw--;
-	    MarkLeakTrail(&state->bspleak, parms, p);
+	    MarkLeakTrail(&state->bspleak, p);
 	    return true;
 	}
     }
@@ -440,6 +440,7 @@ FillOutside(node_t *node, const int hullnum, const int numportals)
     }
 
     if (!map.leakfile) {
+	fillstate.bspleak.maxleaks = numportals;
 	fillstate.bspleak.leaks =
 	    AllocMem(OTHER, sizeof(portal_t *) * numportals, true);
 	StripExtension(options.szBSPName);
@@ -463,7 +464,6 @@ FillOutside(node_t *node, const int hullnum, const int numportals)
     }
 
     /* Set up state and parameters for the recursive fill */
-    fillparms.numportals = numportals;
     fillstate.outleafs = 0;
     fillstate.backdraw = 0;
     fillstate.bspleak.header = false;