zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-26 08:50:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix potential null pointer dereferences when rendering a model with no animations (?)

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6997 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-10-07 05:19:55 +00:00
parent fbbaeff95a
commit 7eb3436bad
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/build/src/mdsprite.cpp
View file

@ -1105,16 +1105,12 @@ void updateanimation(md2model_t *m, const uspritetype *tspr, uint8_t lpal)
goto prep_return; goto prep_return;
} }
fps = smooth->mdsmooth ? fps = smooth->mdsmooth ? Blrintf((1.0f / ((float)tile2model[tile].smoothduration * (1.f / (float)UINT16_MAX))) * 66.f) : anim ? anim->fpssc : 1;
Blrintf((1.0f / ((float)tile2model[tile].smoothduration * (1.f / (float)UINT16_MAX))) * 66.f) :
anim->fpssc;
i = (mdtims - sprext->mdanimtims)*((fps*timerticspersec)/120); i = (mdtims - sprext->mdanimtims) * ((fps * timerticspersec) / 120);
j = (smooth->mdsmooth || !anim) ? 65536 : ((anim->endframe + 1 - anim->startframe) << 16);
if (smooth->mdsmooth)
j = 65536;
else
j = ((anim->endframe+1-anim->startframe)<<16);
// XXX: Just in case you play the game for a VERY long time... // XXX: Just in case you play the game for a VERY long time...
if (i < 0) { i = 0; sprext->mdanimtims = mdtims; } if (i < 0) { i = 0; sprext->mdanimtims = mdtims; }
//compare with j*2 instead of j to ensure i stays > j-65536 for MDANIM_ONESHOT //compare with j*2 instead of j to ensure i stays > j-65536 for MDANIM_ONESHOT
@ -1153,13 +1149,16 @@ void updateanimation(md2model_t *m, const uspritetype *tspr, uint8_t lpal)
} }
else else
{ {
m->cframe = (i>>16)+anim->startframe; if (anim)
m->cframe = (i>>16)+anim->startframe;
#ifdef DEBUGGINGAIDS #ifdef DEBUGGINGAIDS
if (m->cframe >= m->numframes) if (m->cframe >= m->numframes)
OSD_Printf("6: c > n\n"); OSD_Printf("6: c > n\n");
#endif #endif
m->nframe = m->cframe+1; m->nframe = m->cframe+1;
if (m->nframe > anim->endframe) // VERIFY: (!(r_animsmoothing && smooth->mdsmooth)) implies (anim!=NULL) ?
if (anim && m->nframe > anim->endframe) // VERIFY: (!(r_animsmoothing && smooth->mdsmooth)) implies (anim!=NULL) ?
m->nframe = anim->startframe; m->nframe = anim->startframe;
smooth->mdoldframe = m->cframe; smooth->mdoldframe = m->cframe;