QuasarApp/pe-parse
4
0
Fork 0
mirror of https://github.com/QuasarApp/pe-parse.git synced 2025-05-11 18:59:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20 from armbues/master

Browse Source 
Checking for NumberOfRvaAndSizes to avoid DataDirectory overflow
This commit is contained in:
gaasedelen 2016-01-20 19:50:45 -08:00
commit 8505e15e3f
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
parser-library/parse.cpp
View File

@ -375,10 +375,14 @@ bool readOptionalHeader(bounded_buffer *b, optional_header_32 &header) {
READ_DWORD(b, 0, header, LoaderFlags); READ_DWORD(b, 0, header, LoaderFlags);
READ_DWORD(b, 0, header, NumberOfRvaAndSizes); READ_DWORD(b, 0, header, NumberOfRvaAndSizes);
if (header.NumberOfRvaAndSizes > NUM_DIR_ENTRIES) {
header.NumberOfRvaAndSizes = NUM_DIR_ENTRIES;
}
for(::uint32_t i = 0; i < header.NumberOfRvaAndSizes; i++) { for(::uint32_t i = 0; i < header.NumberOfRvaAndSizes; i++) {
::uint32_t c = (i*sizeof(data_directory)); ::uint32_t c = (i*sizeof(data_directory));
c+= _offset(optional_header_32, DataDirectory[0]); c+= _offset(optional_header_32, DataDirectory[0]);
::uint32_t o; ::uint32_t o;
o = c + _offset(data_directory, VirtualAddress); o = c + _offset(data_directory, VirtualAddress);
if(readDword(b, o, header.DataDirectory[i].VirtualAddress) == false) { if(readDword(b, o, header.DataDirectory[i].VirtualAddress) == false) {
@ -426,6 +430,10 @@ bool readOptionalHeader64(bounded_buffer *b, optional_header_64 &header) {
READ_DWORD(b, 0, header, LoaderFlags); READ_DWORD(b, 0, header, LoaderFlags);
READ_DWORD(b, 0, header, NumberOfRvaAndSizes); READ_DWORD(b, 0, header, NumberOfRvaAndSizes);
if (header.NumberOfRvaAndSizes > NUM_DIR_ENTRIES) {
header.NumberOfRvaAndSizes = NUM_DIR_ENTRIES;
}
for(::uint32_t i = 0; i < header.NumberOfRvaAndSizes; i++) { for(::uint32_t i = 0; i < header.NumberOfRvaAndSizes; i++) {
::uint32_t c = (i*sizeof(data_directory)); ::uint32_t c = (i*sizeof(data_directory));
c += _offset(optional_header_64, DataDirectory[0]); c += _offset(optional_header_64, DataDirectory[0]);