From 368afa4bc05e5b66e521b6c881cd8e8f260cf5df Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 11 Jul 2015 00:12:43 +0300 Subject: Add missing checks into other files. --- src/net/ea/playerhandler.cpp | 5 +++++ src/net/eathena/pethandler.cpp | 2 ++ 2 files changed, 7 insertions(+) (limited to 'src/net') diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index 177b3a023..ead22a984 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -100,6 +100,11 @@ void PlayerHandler::processPlayerWarp(Net::MessageIn &msg) localPlayer->stopAttack(); Game *const game = Game::instance(); + if (!game) + { + BLOCK_END("PlayerHandler::processPlayerWarp") + return; + } const std::string ¤tMapName = game->getCurrentMapName(); const bool sameMap = (currentMapName == mapPath); diff --git a/src/net/eathena/pethandler.cpp b/src/net/eathena/pethandler.cpp index d813b6551..8b0103bab 100644 --- a/src/net/eathena/pethandler.cpp +++ b/src/net/eathena/pethandler.cpp @@ -202,6 +202,8 @@ void PetHandler::processEggsList(Net::MessageIn &msg) { const int count = (msg.readInt16("len") - 4) / 2; Inventory *const inv = PlayerInfo::getInventory(); + if (!inv) + return; menu = MenuType::Eggs; if (count == 1) -- cgit v1.2.3-70-g09d2