From f5b4c92a10a6e196d9487083672e91fbe60a12fd Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 21 Dec 2014 22:50:32 +0100 Subject: MCADefrag: Added a sanity check for chunk size. Fixes CID 66448. --- Tools/MCADefrag/MCADefrag.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Tools/MCADefrag') diff --git a/Tools/MCADefrag/MCADefrag.cpp b/Tools/MCADefrag/MCADefrag.cpp index d5d233fd2..0d38a87f1 100644 --- a/Tools/MCADefrag/MCADefrag.cpp +++ b/Tools/MCADefrag/MCADefrag.cpp @@ -269,7 +269,7 @@ bool cMCADefrag::cThread::ReadChunk(cFile & a_File, const Byte * a_LocationRaw) return false; } m_CompressedChunkDataSize = (Buf[0] << 24) | (Buf[1] << 16) | (Buf[2] << 8) | Buf[3]; - if (m_CompressedChunkDataSize > SizeInSectors) + if ((m_CompressedChunkDataSize > SizeInSectors) || (m_CompressedChunkDataSize < 0)) { LOGWARNING("Invalid chunk data - SizeInSectors (%d) smaller that RealSize (%d)", SizeInSectors, m_CompressedChunkDataSize); return false; -- cgit v1.2.3 From 7d35e84578488769c4ee515568bd5f9ed7ef0dac Mon Sep 17 00:00:00 2001 From: Mattes D Date: Thu, 25 Dec 2014 08:47:35 +0100 Subject: Fixed tools compilation. Fixes errors introduced in 081e7ddd028d9382bd52c2b117dae6b6f84225e5. --- Tools/MCADefrag/CMakeLists.txt | 2 ++ Tools/MCADefrag/Globals.h | 1 + 2 files changed, 3 insertions(+) (limited to 'Tools/MCADefrag') diff --git a/Tools/MCADefrag/CMakeLists.txt b/Tools/MCADefrag/CMakeLists.txt index 82e048671..700310edc 100644 --- a/Tools/MCADefrag/CMakeLists.txt +++ b/Tools/MCADefrag/CMakeLists.txt @@ -53,6 +53,7 @@ source_group("Shared" FILES ${SHARED_SRC} ${SHARED_HDR}) set(SHARED_OSS_SRC ../../src/OSSupport/CriticalSection.cpp + ../../src/OSSupport/Event.cpp ../../src/OSSupport/File.cpp ../../src/OSSupport/IsThread.cpp ../../src/OSSupport/StackTrace.cpp @@ -60,6 +61,7 @@ set(SHARED_OSS_SRC set(SHARED_OSS_HDR ../../src/OSSupport/CriticalSection.h + ../../src/OSSupport/Event.h ../../src/OSSupport/File.h ../../src/OSSupport/IsThread.h ../../src/OSSupport/StackTrace.h diff --git a/Tools/MCADefrag/Globals.h b/Tools/MCADefrag/Globals.h index 288069599..f13a06566 100644 --- a/Tools/MCADefrag/Globals.h +++ b/Tools/MCADefrag/Globals.h @@ -201,6 +201,7 @@ typedef unsigned char Byte; // Common headers (without macros): #include "StringUtils.h" #include "OSSupport/CriticalSection.h" +#include "OSSupport/Event.h" #include "OSSupport/IsThread.h" #include "OSSupport/File.h" -- cgit v1.2.3