Fix nil pointer access when recovering from over-full inventory

2016-01-14 22:30:55 -05:00 · 2016-01-14 22:30:55 -05:00 · 71b96bc5de
parent cd63c06aaf
commit 71b96bc5de
1 changed files with 1 additions and 0 deletions
--- a/planet/Objects.ocd/Libraries.ocd/Inventory.ocd/Script.c
+++ b/planet/Objects.ocd/Libraries.ocd/Inventory.ocd/Script.c
@ -407,6 +407,7 @@ func Ejection(object obj)
 		for(var c = 0; c < ContentsCount(); ++c)
 		{
 			var o = Contents(c);
+			if (!o) continue; // safety in case callbacks delete some objects
 			if(o->~IsCarryHeavy())
 				continue;
 			if (GetItemPos(o) == nil)