Ludwig/OSC2AHK
3
2
Fork 0
Code Issues 2 Pull Requests Projects Releases 4 Wiki Activity

Fixed heap corruption in string retrievement, also avoid runtime error if string doesnt fit buffer

Browse Source
This commit is contained in:
Ludwig Frühschütz 2021-04-08 23:53:04 +02:00
parent 4dfb45c5f3
commit db4ca91180
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OSC2AHK/dllmain.cpp
View File

@ -156,7 +156,10 @@ DLLEXPORT char* getStringData(char* targetString, unsigned int targetSize, unsig
{ {
if (storedStrings[i].id == stringId) if (storedStrings[i].id == stringId)
{ {
strcpy_s(targetString, targetSize, storedStrings[i].string.c_str()); if (storedStrings[i].string.length() < targetSize) //Avoid runtime error.
strcpy_s(targetString, targetSize, storedStrings[i].string.c_str());
else
strcpy_s(targetString, targetSize, "\0"); //String doesnt fit, return empty string"
storedStrings.erase(storedStrings.begin() + i); storedStrings.erase(storedStrings.begin() + i);
return targetString; return targetString;
} }

2
msgtest.ahk
View File

@ -48,7 +48,7 @@ msghandlerString(wParam, lParam, msg, hwnd) {
stdout.Write("msghandlerString: ") stdout.Write("msghandlerString: ")
VarSetCapacity(theStr, 20) VarSetCapacity(theStr, 20)
theStr := DllCall("OSC2AHK.dll\getStringData", AStr, theStr, UInt, 20, UInt, lParam, "Cdecl AStr") theStr := DllCall("OSC2AHK.dll\getStringData", str, theStr, UInt, 20, UInt, lParam, AStr)
stdout.WriteLine(theStr) stdout.WriteLine(theStr)
stdout.Close() stdout.Close()