x64dbg/x64dbg
x64dbg
/
x64dbg
1
0
Fork 0
Code Releases 5 Activity

DBG: fix a buffer overflow in a terrible 5-year old API 

Thanks to dudeme for finding a reliable way to reproduce this!
This commit is contained in:
Duncan Ogilvie 2019-11-12 23:55:23 +01:00
parent b0ba7d40e1
commit fae8434284
No known key found for this signature in database
GPG Key ID: FC89E0AAA0C1AAD8
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/dbg/patches.cpp
View File

@ -10,7 +10,8 @@
#include "threading.h"
#include "module.h"
std::unordered_map<duint, PATCHINFO> patches;
static std::unordered_map<duint, PATCHINFO> patches;
static std::unordered_map<DWORD, size_t> lastEnumSize;
bool PatchSet(duint Address, unsigned char OldByte, unsigned char NewByte)
{
@ -159,17 +160,26 @@ bool PatchEnum(PATCHINFO* List, size_t* Size)
if(Size)
{
*Size = patches.size() * sizeof(PATCHINFO);
lastEnumSize[GetCurrentThreadId()] = patches.size();
if(!List)
return true;
}
// Copy each vector entry to a C-style array
for(auto & itr : patches)
auto limit = patches.size();
{
*List = itr.second;
List->addr += ModBaseFromName(itr.second.mod);;
List++;
auto lastSizeItr = lastEnumSize.find(GetCurrentThreadId());
if(lastSizeItr != lastEnumSize.end())
{
limit = lastSizeItr->second;
lastEnumSize.erase(lastSizeItr);
}
}
for(auto itr = patches.cbegin(); itr != patches.cend() && limit != 0; ++itr, --limit, ++List)
{
*List = itr->second;
List->addr += ModBaseFromName(itr->second.mod);
}
return true;