thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'custom3dcrash' into 'next'

Browse source 
Fix sigsegv caused by bad target check in A_Custom3DRotate

See merge request STJr/SRB2!1430
This commit is contained in:
Monster Iestyn 2021-03-24 14:24:21 -04:00
commit b49eeac270
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/p_enemy.c
View file

@ -9879,22 +9879,23 @@ void A_Custom3DRotate(mobj_t *actor)
if (LUA_CallAction(A_CUSTOM3DROTATE, actor)) if (LUA_CallAction(A_CUSTOM3DROTATE, actor))
return; return;
if (!actor->target) // Ensure we actually have a target first.
{
CONS_Printf("Error: A_Custom3DRotate: Object has no target.\n");
P_RemoveMobj(actor);
return;
}
if (actor->target->health == 0) if (actor->target->health == 0)
{ {
P_RemoveMobj(actor); P_RemoveMobj(actor);
return; return;
} }
if (!actor->target) // This should NEVER happen.
{
if (cv_debug)
CONS_Printf("Error: Object has no target\n");
P_RemoveMobj(actor);
return;
}
if (hspeed==0 && vspeed==0) if (hspeed==0 && vspeed==0)
{ {
CONS_Printf("Error: A_Custom3DRotate: Object has no speed.\n"); if (cv_debug)
CONS_Printf("Error: A_Custom3DRotate: Object has no speed.\n");
return; return;
} }