aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/common/Collision/Management/MMapManager.cpp2
-rw-r--r--src/server/game/Entities/Player/Player.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp
index ff87ed369cc..44ef59d5360 100644
--- a/src/common/Collision/Management/MMapManager.cpp
+++ b/src/common/Collision/Management/MMapManager.cpp
@@ -157,7 +157,7 @@ namespace MMAP
long pos = ftell(file);
fseek(file, 0, SEEK_END);
- if (static_cast<int32>(fileHeader.size) > ftell(file) - pos)
+ if (pos < 0 || static_cast<int32>(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 1a3b7cd9968..1699550b8b5 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -176,6 +176,7 @@ Player::Player(WorldSession* session): Unit(true)
m_session = session;
m_ingametime = 0;
+ m_sharedQuestId = 0;
m_ExtraFlags = 0;