From 742c5f1e0b4690ef7ab3923e406b2599ea01b985 Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 17 Jan 2017 20:14:44 +0100 Subject: Fix static analysis issues CID 1291964 CID 1292775 (cherry picked from commit 6767bbc95f46df4b62c8131a39a132d3f9bb8a26) Conflicts: src/server/game/Entities/Player/Player.cpp src/server/game/Spells/SpellHistory.h src/server/game/Spells/SpellInfo.cpp --- src/common/Collision/Management/MMapManager.cpp | 11 +++++++++++ src/server/game/Spells/SpellHistory.cpp | 1 - 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/common/Collision/Management/MMapManager.cpp b/src/common/Collision/Management/MMapManager.cpp index e5f503bf70a..cec5c0da7f0 100644 --- a/src/common/Collision/Management/MMapManager.cpp +++ b/src/common/Collision/Management/MMapManager.cpp @@ -154,6 +154,17 @@ namespace MMAP return false; } + long pos = ftell(file); + fseek(file, 0, SEEK_END); + if (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); + return false; + } + + fseek(file, pos, SEEK_SET); + unsigned char* data = (unsigned char*)dtAlloc(fileHeader.size, DT_ALLOC_PERM); ASSERT(data); diff --git a/src/server/game/Spells/SpellHistory.cpp b/src/server/game/Spells/SpellHistory.cpp index 808da17dbd6..00edb2672b2 100644 --- a/src/server/game/Spells/SpellHistory.cpp +++ b/src/server/game/Spells/SpellHistory.cpp @@ -137,7 +137,6 @@ void SpellHistory::SaveToDB(SQLTransaction& trans) void SpellHistory::Update() { - SQLTransaction t; Clock::time_point now = Clock::now(); for (auto itr = _categoryCooldowns.begin(); itr != _categoryCooldowns.end();) { -- cgit v1.2.3