zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- added NULL pointer checks to AActor::RemoveInventory to prevent items that destroy their owner in their use state from crashing the engine.

This commit is contained in:
Christoph Oelckers 2015-02-26 12:13:17 +01:00
parent 84f8c299ce
commit 13e98c301a
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/p_mobj.cpp
View File

@ -575,20 +575,23 @@ void AActor::AddInventory (AInventory *item)
//
//============================================================================
void AActor::RemoveInventory (AInventory *item)
void AActor::RemoveInventory(AInventory *item)
{
AInventory *inv, **invp;
invp = &item->Owner->Inventory;
for (inv = *invp; inv != NULL; invp = &inv->Inventory, inv = *invp)
if (item != NULL && item->Owner != NULL) // can happen if the owner was destroyed by some action from an item's use state.
{
if (inv == item)
invp = &item->Owner->Inventory;
for (inv = *invp; inv != NULL; invp = &inv->Inventory, inv = *invp)
{
*invp = item->Inventory;
item->DetachFromOwner ();
item->Owner = NULL;
item->Inventory = NULL;
break;
if (inv == item)
{
*invp = item->Inventory;
item->DetachFromOwner();
item->Owner = NULL;
item->Inventory = NULL;
break;
}
}
}
}