mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 05:53:02 +01:00
Code Issues Releases Wiki Activity

Fix #4553: crash due to accessing invalid sprite

Browse Source 
Assertion gets hit when trying to get invalid sprite from
remove_peep_from_queue
This commit is contained in:
Michał Janiszewski
2016-10-12 09:18:41 +02:00
committed by Ted John
parent 2e35073ee7
commit a80461da80
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/peep/peep.c
View File

@@ -2150,13 +2150,14 @@ void remove_peep_from_queue(rct_peep* peep)
return;
}
for (rct_peep* other_peep = GET_PEEP(ride->last_peep_in_queue[cur_station]);
ride->last_peep_in_queue[cur_station] != 0xFFFF;
other_peep = GET_PEEP(other_peep->next_in_queue)){
uint16 spriteId = ride->last_peep_in_queue[cur_station];
while (spriteId != 0xFFFF) {
rct_peep* other_peep = GET_PEEP(spriteId);
if (peep->sprite_index == other_peep->next_in_queue){
other_peep->next_in_queue = peep->next_in_queue;
return;
}
spriteId = other_peep->next_in_queue;
}
}