[Crash] null pointer check to avoid unexpected behavior (opentibiabr#664

) With this check, we avoid a crash by sending the null "Item*" (first variable) to the "internalRemoveItem" function.
pudimtibia · Dec 8, 2022 · 81cf1f5 · 81cf1f5
1 parent eed2c44
commit 81cf1f5
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/game/game.cpp b/src/game/game.cpp
@@ -1673,6 +1673,10 @@ ReturnValue Game::internalAddItem(Cylinder* toCylinder, Item* item, int32_t inde
 
 ReturnValue Game::internalRemoveItem(Item* item, int32_t count /*= -1*/, bool test /*= false*/, uint32_t flags /*= 0*/)
 {
+	if (item == nullptr) {
+		SPDLOG_DEBUG("{} - Item is nullptr", __FUNCTION__);
+		return RETURNVALUE_NOTPOSSIBLE;
+	}
 	Cylinder* cylinder = item->getParent();
 	if (cylinder == nullptr) {
 		SPDLOG_DEBUG("{} - Cylinder is nullptr", __FUNCTION__);