dhewm/dhewm3
0
0
Fork 0
mirror of https://github.com/dhewm/dhewm3.git synced 2025-02-20 11:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some ubsan warnings

Browse source
This commit is contained in:
Daniel Gibson 2021-06-22 22:39:02 +02:00
parent e1e8103982
commit 2a85b73110
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
neo/game/SmokeParticles.cpp
View file

@ -207,7 +207,7 @@ bool idSmokeParticles::EmitSmoke( const idDeclParticle *smoke, const int systemS
int finalParticleTime = stage->cycleMsec * stage->spawnBunching;
int deltaMsec = gameLocal.time - systemStartTime;
int nowCount, prevCount;
int nowCount=0, prevCount=0;
if ( finalParticleTime == 0 ) {
// if spawnBunching is 0, they will all come out at once
if ( gameLocal.time == systemStartTime ) {

3
neo/renderer/tr_light.cpp
View file

@ -1217,7 +1217,8 @@ void R_AddDrawSurf( const srfTriangles_t *tri, const viewEntity_t *space, const
tr.viewDef->maxDrawSurfs *= 2;
}
tr.viewDef->drawSurfs = (drawSurf_t **)R_FrameAlloc( tr.viewDef->maxDrawSurfs * sizeof( tr.viewDef->drawSurfs[0] ) );
memcpy( tr.viewDef->drawSurfs, old, count );
if(count > 0)
memcpy( tr.viewDef->drawSurfs, old, count ); // XXX null pointer passed as argument 2, which is declared to never be null
}
tr.viewDef->drawSurfs[tr.viewDef->numDrawSurfs] = drawSurf;
tr.viewDef->numDrawSurfs++;

16
neo/renderer/tr_trisurf.cpp
View file

@ -813,8 +813,12 @@ void R_CreateDupVerts( srfTriangles_t *tri ) {
}
}
tri->dupVerts = triDupVertAllocator.Alloc( tri->numDupVerts * 2 );
memcpy( tri->dupVerts, tempDupVerts, tri->numDupVerts * 2 * sizeof( tri->dupVerts[0] ) );
if(tri->numDupVerts > 0) {
tri->dupVerts = triDupVertAllocator.Alloc( tri->numDupVerts * 2 );
memcpy( tri->dupVerts, tempDupVerts, tri->numDupVerts * 2 * sizeof( tri->dupVerts[0] ) ); // runtime error: null pointer passed as argument 1, which is declared to never be null
} else {
tri->dupVerts = NULL;
}
}
/*
@ -1112,8 +1116,12 @@ void R_IdentifySilEdges( srfTriangles_t *tri, bool omitCoplanarEdges ) {
}
tri->numSilEdges = numSilEdges;
tri->silEdges = triSilEdgeAllocator.Alloc( numSilEdges );
memcpy( tri->silEdges, silEdges, numSilEdges * sizeof( tri->silEdges[0] ) );
if(numSilEdges > 0) {
tri->silEdges = triSilEdgeAllocator.Alloc( numSilEdges );
memcpy( tri->silEdges, silEdges, numSilEdges * sizeof( tri->silEdges[0] ) );
} else {
tri->silEdges = NULL;
}
}
/*