TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Prevent Point_segs underflow on player death

Browse source 
If the player commits suicide in Descent 2, Point_segs[-2] is accessed
because aip->hide_index = -1, aip->path_length = 0.  As a spot fix,
check for underflow and skip the access if it would be out of bounds.
This commit is contained in:
Kp 2018-06-14 02:39:15 +00:00
parent 8690bf4ca7
commit c991f8b107
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
similar/main/ai.cpp
View file

@ -3650,9 +3650,13 @@ _exit_cheat:
int anger_level = 65;
if (aip->behavior == ai_behavior::AIB_STATION)
if (Point_segs[aip->hide_index + aip->path_length - 1].segnum == aip->hide_segment) {
{
const std::size_t idx = aip->hide_index + aip->path_length - 1;
if (idx < Point_segs.size() && Point_segs[idx].segnum == aip->hide_segment)
{
anger_level = 64;
}
}
compute_vis_and_vec(vmsegptridx, obj, player_info, vis_vec_pos, ailp, vec_to_player, &player_visibility, robptr, &visibility_and_vec_computed);