chenx221/Textractor
1
0
Fork 0
forked from Public-Mirror/Textractor
Code Pull Requests Activity

fix buffer overrun

Browse Source
This commit is contained in:
Akash Mozumdar 2018-11-27 15:56:28 -05:00
parent 943e53e9a2
commit bb86bde8a5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vnrhook/main.cc
View File

@ -94,9 +94,10 @@ DWORD WINAPI Pipe(LPVOID)
void TextOutput(ThreadParam tp, BYTE* text, int len) void TextOutput(ThreadParam tp, BYTE* text, int len)
{ {
if (len < 0) return; if (len < 0) return;
if (len > PIPE_BUFFER_SIZE - sizeof(ThreadParam)) len = PIPE_BUFFER_SIZE - sizeof(ThreadParam);
BYTE buffer[PIPE_BUFFER_SIZE] = {}; BYTE buffer[PIPE_BUFFER_SIZE] = {};
*(ThreadParam*)buffer = tp; *(ThreadParam*)buffer = tp;
memcpy_s(buffer + sizeof(ThreadParam), sizeof(buffer) - sizeof(ThreadParam), text, len); memcpy(buffer + sizeof(ThreadParam), text, len);
WriteFile(hookPipe, buffer, sizeof(ThreadParam) + len, &DUMMY, nullptr); WriteFile(hookPipe, buffer, sizeof(ThreadParam) + len, &DUMMY, nullptr);
} }
@ -155,9 +156,9 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD fdwReason, LPVOID)
void NewHook(HookParam hp, LPCSTR lpname, DWORD flag) void NewHook(HookParam hp, LPCSTR lpname, DWORD flag)
{ {
std::string name = lpname; std::string name = lpname;
if (++currentHook < MAX_HOOK) if (++currentHook < MAX_HOOK)
{ {
if (name.empty()) name = "UserHook" + std::to_string(userhookCount++); if (name.empty()) name = "UserHook " + std::to_string(userhookCount++);
ConsoleOutput(INSERTING_HOOK + name); ConsoleOutput(INSERTING_HOOK + name);
// jichi 7/13/2014: This function would raise when too many hooks added // jichi 7/13/2014: This function would raise when too many hooks added