Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[EU-FOSSA] Check string length to copy to avoid crash in purgeMenuItemString function

Browse Source
This commit is contained in:
Don HO 2019-02-22 19:58:20 +01:00
parent eec82cc2a6
commit 5085d9c95a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PowerEditor/src/MISC/Common/Common.cpp
View File

@ -361,9 +361,13 @@ bool isInList(const TCHAR *token, const TCHAR *list)
generic_string purgeMenuItemString(const TCHAR * menuItemStr, bool keepAmpersand) generic_string purgeMenuItemString(const TCHAR * menuItemStr, bool keepAmpersand)
{ {
TCHAR cleanedName[64] = TEXT(""); const size_t cleanedNameLen = 64;
TCHAR cleanedName[cleanedNameLen] = TEXT("");
size_t j = 0; size_t j = 0;
size_t menuNameLen = lstrlen(menuItemStr); size_t menuNameLen = lstrlen(menuItemStr);
if (menuNameLen >= cleanedNameLen)
menuNameLen = cleanedNameLen - 1;
for (size_t k = 0 ; k < menuNameLen ; ++k) for (size_t k = 0 ; k < menuNameLen ; ++k)
{ {
if (menuItemStr[k] == '\t') if (menuItemStr[k] == '\t')