fix hang in tjunction.c

git-svn-id: svn://svn.icculus.org/netradiant/trunk@189 61c419a2-8eb2-4b30-bcec-8cead039b335

diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index 4e5c0eeaebff22b3819fb7ebf9bf619285746857..3224d8e93fcc9b371040f194f5d824b57d028616 100644 (file)
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -2374,7 +2374,7 @@ Q_EXTERN bspAdvertisement_t       bspAds[ MAX_MAP_ADVERTISEMENTS ];
                                allocated = def; \
                        while(reqitem >= allocated && allocated) \
                                allocated *= 2; \
                                allocated = def; \
                        while(reqitem >= allocated && allocated) \
                                allocated *= 2; \

-                       if(allocated > 2147483647 / sizeof(*ptr)) \
+                       if(!allocated || allocated > 2147483647 / sizeof(*ptr)) \

                        { \
                                Error(#ptr " over 2 GB"); \
                        } \
                        { \
                                Error(#ptr " over 2 GB"); \
                        } \

diff --git a/tools/quake3/q3map2/tjunction.c b/tools/quake3/q3map2/tjunction.c
index 416d56c363986fc0eaed535a8c873cf4915891b6..4a590b7f5440c9a08c58857506a7d5211822a475 100644 (file)
--- a/tools/quake3/q3map2/tjunction.c
+++ b/tools/quake3/q3map2/tjunction.c
@@ -55,7 +55,7 @@ typedef struct edgeLine_s {
        vec3_t          origin;
        vec3_t          dir;
 
        vec3_t          origin;
        vec3_t          dir;
 

-       edgePoint_t     chain;          // unused element of doubly linked list
+       edgePoint_t     *chain;         // unused element of doubly linked list

 } edgeLine_t;
 
 typedef struct {
 } edgeLine_t;
 
 typedef struct {


@@ -100,14 +100,14 @@ void InsertPointOnEdge( vec3_t v, edgeLine_t *e ) {
        p->intercept = d;
        VectorCopy( v, p->xyz );
 
        p->intercept = d;
        VectorCopy( v, p->xyz );
 

-       if ( e->chain.next == &e->chain ) {
-               e->chain.next = e->chain.prev = p;
-               p->next = p->prev = &e->chain;
+       if ( e->chain->next == e->chain ) {
+               e->chain->next = e->chain->prev = p;
+               p->next = p->prev = e->chain;

                return;
        }
 
                return;
        }
 

-       scan = e->chain.next;
-       for ( ; scan != &e->chain ; scan = scan->next ) {
+       scan = e->chain->next;
+       for ( ; scan != e->chain ; scan = scan->next ) {

                d = p->intercept - scan->intercept;
                if ( d > -LINE_POSITION_EPSILON && d < LINE_POSITION_EPSILON ) {
                        free( p );
                d = p->intercept - scan->intercept;
                if ( d > -LINE_POSITION_EPSILON && d < LINE_POSITION_EPSILON ) {
                        free( p );


@@ -195,7 +195,8 @@ int AddEdge( vec3_t v1, vec3_t v2, qboolean createNonAxial ) {
        e = &edgeLines[ numEdgeLines ];
        numEdgeLines++;
 
        e = &edgeLines[ numEdgeLines ];
        numEdgeLines++;
 

-       e->chain.next = e->chain.prev = &e->chain;
+       e->chain = safe_malloc( sizeof(edgePoint_t) );
+       e->chain->next = e->chain->prev = e->chain;

 
        VectorCopy( v1, e->origin );
        VectorCopy( dir, e->dir );
 
        VectorCopy( v1, e->origin );
        VectorCopy( dir, e->dir );


@@ -373,12 +374,12 @@ void FixSurfaceJunctions( mapDrawSurface_t *ds ) {
 
 
                if ( start < end ) {
 
 
                if ( start < end ) {

-                       p = e->chain.next;
+                       p = e->chain->next;

                } else {
                } else {

-                       p = e->chain.prev;
+                       p = e->chain->prev;

                }
 
                }
 

-               for (  ; p != &e->chain ;  ) {
+               for (  ; p != e->chain ;  ) {

                        if ( start < end ) {
                                if ( p->intercept > end - ON_EPSILON ) {
                                        break;
                        if ( start < end ) {
                                if ( p->intercept > end - ON_EPSILON ) {
                                        break;


@@ -628,7 +629,7 @@ void FixTJunctions( entity_t *ent )
        shaderInfo_t            *si;
        int                                     axialEdgeLines;
        originalEdge_t          *e;
        shaderInfo_t            *si;
        int                                     axialEdgeLines;
        originalEdge_t          *e;

-       
+       bspDrawVert_t   *dv;

        
        /* meta mode has its own t-junction code (currently not as good as this code) */
        //%     if( meta )
        
        /* meta mode has its own t-junction code (currently not as good as this code) */
        //%     if( meta )


@@ -679,7 +680,8 @@ void FixTJunctions( entity_t *ent )
        // this gives the most accurate edge description
        for ( i = 0 ; i < numOriginalEdges ; i++ ) {
                e = &originalEdges[i];
        // this gives the most accurate edge description
        for ( i = 0 ; i < numOriginalEdges ; i++ ) {
                e = &originalEdges[i];

-               e->dv[ 0 ]->lightmap[ 0 ][ 0 ] = AddEdge( e->dv[ 0 ]->xyz, e->dv[ 1 ]->xyz, qtrue );
+               dv = e->dv[0]; // e might change during AddEdge
+               dv->lightmap[ 0 ][ 0 ] = AddEdge( e->dv[ 0 ]->xyz, e->dv[ 1 ]->xyz, qtrue );

        }
 
        Sys_FPrintf( SYS_VRB, "%9d axial edge lines\n", axialEdgeLines );
        }
 
        Sys_FPrintf( SYS_VRB, "%9d axial edge lines\n", axialEdgeLines );