diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp index 0feb091c59..d83339fb17 100644 --- a/src/common/Collision/Management/MMapManager.cpp +++ b/src/common/Collision/Management/MMapManager.cpp @@ -165,7 +165,7 @@ namespace MMAP long pos = ftell(file); fseek(file, 0, SEEK_END); - if (static_cast(fileHeader.size) > ftell(file) - pos) + if (pos < 0 || static_cast(fileHeader.size) > ftell(file) - pos) { TC_LOG_ERROR("maps", "MMAP:loadMap: %03u%02i%02i.mmtile has corrupted data size", mapId, x, y); fclose(file); diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index da2c1dfd97..06de5eb26b 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -315,6 +315,7 @@ Player::Player(WorldSession* session): Unit(true) m_session = session; m_ingametime = 0; + m_sharedQuestId = 0; m_ExtraFlags = 0;