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

[EU-FOSSA] Fix stack overflow issue on User Define Language dialog

Browse Source
This commit is contained in:
Don HO 2019-01-30 01:52:18 +01:00
parent c314ed1d8a
commit 5eaf67b647
2 changed files with 51 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
PowerEditor/src/ScitillaComponent/UserDefineDialog.cpp
View File

@ -48,6 +48,55 @@ GlobalMappers & globalMappper()
return gm; return gm;
} }
void convertTo(TCHAR *dest, int destLen, const TCHAR *toConvert, TCHAR *prefix)
{
bool inGroup = false;
int index = lstrlen(dest);
if (index > 0)
dest[index++] = ' ';
dest[index++] = prefix[0];
dest[index++] = prefix[1];
for (size_t i = 0, len = lstrlen(toConvert); i < len && index < destLen - 7; ++i)
{
if (i == 0 && toConvert[i] == '(' && toConvert[i + 1] == '(')
{
inGroup = true;
}
else if (toConvert[i] == ' ' && toConvert[i + 1] == '(' && toConvert[i + 2] == '(')
{
inGroup = true;
dest[index++] = ' ';
dest[index++] = prefix[0];
dest[index++] = prefix[1];
++i; // skip space
}
if (inGroup && toConvert[i - 1] == ')' && toConvert[i - 2] == ')')
{
inGroup = false;
}
if (toConvert[i] == ' ')
{
if (toConvert[i + 1] != ' ' && toConvert[i + 1] != '\0')
{
dest[index++] = ' ';
if (!inGroup)
{
dest[index++] = prefix[0];
dest[index++] = prefix[1];
}
}
}
else
{
dest[index++] = toConvert[i];
}
}
dest[index] = '\0';
};
bool SharedParametersDialog::setPropertyByCheck(HWND hwnd, WPARAM id, bool & bool2set) bool SharedParametersDialog::setPropertyByCheck(HWND hwnd, WPARAM id, bool & bool2set)
{ {
bool2set = (BST_CHECKED == ::SendMessage(::GetDlgItem(hwnd, int(id)), BM_GETCHECK, 0, 0)); bool2set = (BST_CHECKED == ::SendMessage(::GetDlgItem(hwnd, int(id)), BM_GETCHECK, 0, 0));
@ -175,54 +224,6 @@ void FolderStyleDialog::updateDlg()
::SendDlgItemMessage(_hSelf, IDC_FOLDER_IN_COMMENT_CLOSE_EDIT, WM_SETTEXT, 0, reinterpret_cast<LPARAM>(_pUserLang->_keywordLists[SCE_USER_KWLIST_FOLDERS_IN_COMMENT_CLOSE])); ::SendDlgItemMessage(_hSelf, IDC_FOLDER_IN_COMMENT_CLOSE_EDIT, WM_SETTEXT, 0, reinterpret_cast<LPARAM>(_pUserLang->_keywordLists[SCE_USER_KWLIST_FOLDERS_IN_COMMENT_CLOSE]));
} }
void FolderStyleDialog::convertTo(TCHAR *dest, const TCHAR *toConvert, TCHAR *prefix) const
{
bool inGroup = false;
int index = lstrlen(dest);
if (index > 0)
dest[index++] = ' ';
dest[index++] = prefix[0];
dest[index++] = prefix[1];
for (size_t i = 0, len = lstrlen(toConvert); i < len ; ++i)
{
if (i == 0 && toConvert[i] == '(' && toConvert[i+1] == '(')
{
inGroup = true;
}
else if (toConvert[i] == ' ' && toConvert[i+1] == '(' && toConvert[i+2] == '(')
{
inGroup = true;
dest[index++] = ' ';
dest[index++] = prefix[0];
dest[index++] = prefix[1];
++i; // skip space
}
if (inGroup && toConvert[i-1] == ')' && toConvert[i-2] == ')')
{
inGroup = false;
}
if (toConvert[i] == ' ')
{
if (toConvert[i+1] != ' ' && toConvert[i+1] != '\0')
{
dest[index++] = ' ';
if (!inGroup)
{
dest[index++] = prefix[0];
dest[index++] = prefix[1];
}
}
}
else
{
dest[index++] = toConvert[i];
}
}
dest[index] = '\0';
}
void FolderStyleDialog::retrieve(TCHAR *dest, const TCHAR *toRetrieve, TCHAR *prefix) const void FolderStyleDialog::retrieve(TCHAR *dest, const TCHAR *toRetrieve, TCHAR *prefix) const
{ {
int j = 0; int j = 0;
@ -520,61 +521,13 @@ void CommentStyleDialog::setKeywords2List(int id)
{ {
generic_itoa(i, intBuffer+1, 10); generic_itoa(i, intBuffer+1, 10);
::GetDlgItemText(_hSelf, list[i], buffer, max_char); ::GetDlgItemText(_hSelf, list[i], buffer, max_char);
convertTo(newList, buffer, intBuffer); convertTo(newList, max_char, buffer, intBuffer);
} }
lstrcpy(_pUserLang->_keywordLists[index], newList); lstrcpy(_pUserLang->_keywordLists[index], newList);
} }
} }
void CommentStyleDialog::convertTo(TCHAR *dest, const TCHAR *toConvert, TCHAR *prefix) const
{
bool inGroup = false;
int index = lstrlen(dest);
if (index > 0)
dest[index++] = ' ';
dest[index++] = prefix[0];
dest[index++] = prefix[1];
for (size_t i = 0, len = lstrlen(toConvert); i < len ; ++i)
{
if (i == 0 && toConvert[i] == '(' && toConvert[i+1] == '(')
{
inGroup = true;
}
else if (toConvert[i] == ' ' && toConvert[i+1] == '(' && toConvert[i+2] == '(')
{
inGroup = true;
dest[index++] = ' ';
dest[index++] = prefix[0];
dest[index++] = prefix[1];
++i; // skip space
}
if (inGroup && toConvert[i-1] == ')' && toConvert[i-2] == ')')
{
inGroup = false;
}
if (toConvert[i] == ' ')
{
if (toConvert[i+1] != ' ' && toConvert[i+1] != '\0')
{
dest[index++] = ' ';
if (!inGroup)
{
dest[index++] = prefix[0];
dest[index++] = prefix[1];
}
}
}
else
{
dest[index++] = toConvert[i];
}
}
dest[index] = '\0';
}
void CommentStyleDialog::retrieve(TCHAR *dest, const TCHAR *toRetrieve, TCHAR *prefix) const void CommentStyleDialog::retrieve(TCHAR *dest, const TCHAR *toRetrieve, TCHAR *prefix) const
{ {
int j = 0; int j = 0;
@ -767,53 +720,6 @@ INT_PTR CALLBACK SymbolsStyleDialog::run_dlgProc(UINT Message, WPARAM wParam, LP
} }
} }
void SymbolsStyleDialog::convertTo(TCHAR *dest, const TCHAR *toConvert, TCHAR *prefix) const
{
bool inGroup = false;
int index = lstrlen(dest);
if (index > 0)
dest[index++] = ' ';
dest[index++] = prefix[0];
dest[index++] = prefix[1];
for (size_t i = 0, len = lstrlen(toConvert); i < len ; ++i)
{
if (i == 0 && toConvert[i] == '(' && toConvert[i+1] == '(')
{
inGroup = true;
}
else if (toConvert[i] == ' ' && toConvert[i+1] == '(' && toConvert[i+2] == '(')
{
inGroup = true;
dest[index++] = ' ';
dest[index++] = prefix[0];
dest[index++] = prefix[1];
++i; // skip space
}
if (inGroup && toConvert[i-1] == ')' && toConvert[i-2] == ')')
{
inGroup = false;
}
if (toConvert[i] == ' ')
{
if (toConvert[i+1] != ' ' && toConvert[i+1] != '\0')
{
dest[index++] = ' ';
if (!inGroup)
{
dest[index++] = prefix[0];
dest[index++] = prefix[1];
}
}
}
else
{
dest[index++] = toConvert[i];
}
}
dest[index] = '\0';
}
void SymbolsStyleDialog::retrieve(TCHAR *dest, const TCHAR *toRetrieve, TCHAR *prefix) const void SymbolsStyleDialog::retrieve(TCHAR *dest, const TCHAR *toRetrieve, TCHAR *prefix) const
{ {
@ -927,7 +833,7 @@ void SymbolsStyleDialog::setKeywords2List(int id)
int dd = list[i]; int dd = list[i];
::GetDlgItemText(_hSelf, dd, buffer, max_char); ::GetDlgItemText(_hSelf, dd, buffer, max_char);
convertTo(newList, buffer, intBuffer); convertTo(newList, max_char, buffer, intBuffer);
} }
lstrcpy(_pUserLang->_keywordLists[SCE_USER_KWLIST_DELIMITERS], newList); lstrcpy(_pUserLang->_keywordLists[SCE_USER_KWLIST_DELIMITERS], newList);

3
PowerEditor/src/ScitillaComponent/UserDefineDialog.h
View File

@ -272,7 +272,6 @@ protected :
INT_PTR CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam);
void setKeywords2List(int ctrlID); void setKeywords2List(int ctrlID);
private : private :
void convertTo(TCHAR *dest, const TCHAR *toConvert, TCHAR *prefix) const;
void retrieve(TCHAR *dest, const TCHAR *toRetrieve, TCHAR *prefix) const; void retrieve(TCHAR *dest, const TCHAR *toRetrieve, TCHAR *prefix) const;
URLCtrl _pageLink; URLCtrl _pageLink;
}; };
@ -296,7 +295,6 @@ protected :
INT_PTR CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam);
void setKeywords2List(int id); void setKeywords2List(int id);
private : private :
void convertTo(TCHAR *dest, const TCHAR *toConvert, TCHAR *prefix) const;
void retrieve(TCHAR *dest, const TCHAR *toRetrieve, TCHAR *prefix) const; void retrieve(TCHAR *dest, const TCHAR *toRetrieve, TCHAR *prefix) const;
}; };
@ -309,7 +307,6 @@ protected :
INT_PTR CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam);
void setKeywords2List(int id); void setKeywords2List(int id);
private : private :
void convertTo(TCHAR *dest, const TCHAR *toConvert, TCHAR *prefix) const;
void retrieve(TCHAR *dest, const TCHAR *toRetrieve, TCHAR *prefix) const; void retrieve(TCHAR *dest, const TCHAR *toRetrieve, TCHAR *prefix) const;
}; };