Magic-Mirror/retdec
1
0
Fork 0
mirror of https://github.com/avast/retdec.git synced 2024-11-23 21:10:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #873 from avast/LZ_Issue_872

Browse Source 
Fixed issue #872
This commit is contained in:
Petr Zemek 2020-10-21 16:02:58 +02:00 committed by GitHub
commit 220212c135
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/retdec/pelib/ImageLoader.h
View File

@ -202,6 +202,11 @@ class ImageLoader
return (sectionIndex < sections.size()) ? &sections[sectionIndex] : nullptr;
}
std::uint64_t getSizeOfFile() const
{
return fileSize;
}
std::uint64_t getOrdinalMask() const
{
return (uint64_t)1 << (getImageBitability() - 1);
@ -446,6 +451,7 @@ class ImageLoader
PELIB_IMAGE_OPTIONAL_HEADER optionalHeader; // 32/64-bit optional header
ByteBuffer rawFileData; // Loaded content of the image in case it couldn't have been mapped
LoaderError ldrError;
std::uint64_t fileSize; // Size of the raw file
std::uint32_t windowsBuildNumber;
std::uint32_t ntSignature;
std::uint32_t maxSectionCount;

3
src/pelib/ImageLoader.cpp
View File

@ -871,6 +871,9 @@ int PeLib::ImageLoader::Load(
{
int fileError;
// Remember the size of the file for later use
fileSize = fileData.size();
// Check and capture DOS header
fileError = captureDosHeader(fileData);
if(fileError != ERROR_NONE)

11
src/pelib/RelocationsDirectory.cpp
View File

@ -26,6 +26,7 @@ namespace PeLib
std::uint32_t rva = imageLoader.getDataDirRva(PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC);
std::uint32_t size = imageLoader.getDataDirSize(PELIB_IMAGE_DIRECTORY_ENTRY_BASERELOC);
std::uint32_t sizeOfImage = imageLoader.getSizeOfImage();
std::uint64_t sizeOfFile = imageLoader.getSizeOfFile();
// Check for relocations out of image
if(rva >= sizeOfImage || (rva + size) < rva || (rva + size) > sizeOfImage)
@ -34,9 +35,17 @@ namespace PeLib
return ERROR_INVALID_FILE;
}
// Check for relocations out of file
if(size > sizeOfFile)
{
RelocationsDirectory::setLoaderError(LDR_ERROR_RELOCATIONS_OUT_OF_IMAGE);
return ERROR_INVALID_FILE;
}
// Read the entire relocation directory from the image
std::vector<std::uint8_t> vRelocDirectory(size);
imageLoader.readImage(vRelocDirectory.data(), rva, size);
if(imageLoader.readImage(vRelocDirectory.data(), rva, size) != size)
return ERROR_INVALID_FILE;
// Parse the relocations directory
read(vRelocDirectory.data(), size, sizeOfImage);