X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=svbsp.c;h=1ad7fafc82248c7826c96da409514800468c1fa4;hb=9ba01c31e0bebb3ada7724316d63a393053102d3;hp=e4ef43b5ef0009fd88e07c65050faafc5c768dc2;hpb=26ccdc94801f8c893924f624ddfc9bcb0fea1168;p=xonotic%2Fdarkplaces.git diff --git a/svbsp.c b/svbsp.c index e4ef43b5..1ad7fafc 100644 --- a/svbsp.c +++ b/svbsp.c @@ -1,7 +1,7 @@ -// Shadow Volume BSP code written by Forest "LordHavoc" Hale on 2003-11-06 and placed into public domain. -// Modified by LordHavoc (to make it work and other nice things like that) on 2007-01-24 and 2007-01-25 -// Optimized by LordHavoc on 2009-12-24 and 2009-12-25 +// Shadow Volume BSP code written by Ashley Rose Hale (LadyHavoc) on 2003-11-06 and placed into public domain. +// Modified by LadyHavoc (to make it work and other nice things like that) on 2007-01-24 and 2007-01-25 +// Optimized by LadyHavoc on 2009-12-24 and 2009-12-25 #include #include @@ -158,7 +158,7 @@ static void SVBSP_InsertOccluderPolygonNodes(svbsp_t *b, int *parentnodenumpoint { // now we need to create up to numpoints + 1 new nodes, forming a BSP tree // describing the occluder polygon's shadow volume - int i, j, p, basenum; + int i, j, p; svbsp_node_t *node; // points and lines are valid testers but not occluders @@ -187,7 +187,6 @@ static void SVBSP_InsertOccluderPolygonNodes(svbsp_t *b, int *parentnodenumpoint // note down the first available nodenum for the *parentnodenumpointer // line which is done last to allow multithreaded queries during an // insertion - basenum = b->numnodes; for (i = 0, p = poly->numpoints - 1;i < poly->numpoints;p = i, i++) { #if 1 @@ -410,6 +409,9 @@ int SVBSP_AddPolygon(svbsp_t *b, int numpoints, const float *points, int inserto // note we still allow points and lines to be tested... if (numpoints < 1) return 0; + // if the polygon has too many points, we would crash + if (numpoints > MAX_SVBSP_POLYGONPOINTS) + return 0; poly.numpoints = numpoints; for (i = 0;i < numpoints;i++) {