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

Fix the crash issue in UDL

Browse Source 
Fixes #1887, Closes #1965
Fix crash issue while UDL's user keyword list is too long.
This commit is contained in:
Christian Grasser 2016-06-14 21:36:25 +02:00 committed by Don HO
parent 79a9f42e37
commit fe7257faf1
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PowerEditor/src/Parameters.cpp
View File

@ -3170,7 +3170,14 @@ void NppParameters::feedUserKeywordList(TiXmlNode *node)
if (globalMappper().keywordIdMapper.find(keywordsName) != globalMappper().keywordIdMapper.end()) if (globalMappper().keywordIdMapper.find(keywordsName) != globalMappper().keywordIdMapper.end())
{ {
id = globalMappper().keywordIdMapper[keywordsName]; id = globalMappper().keywordIdMapper[keywordsName];
lstrcpy(_userLangArray[_nbUserLang - 1]->_keywordLists[id], kwl); if (_tcslen(kwl) < max_char)
{
lstrcpy(_userLangArray[_nbUserLang - 1]->_keywordLists[id], kwl);
}
else
{
lstrcpy(_userLangArray[_nbUserLang - 1]->_keywordLists[id], TEXT("imported string too long, needs to be < max_char(30720)"));
}
} }
} }
} }

2
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
View File

@ -720,7 +720,7 @@ void ScintillaEditView::setUserLexer(const TCHAR *userLangName)
bool inSingleQuote = false; bool inSingleQuote = false;
bool nonWSFound = false; bool nonWSFound = false;
int index = 0; int index = 0;
for (size_t j=0, len = strlen(keyWords_char); j<len; ++j) for (size_t j=0, len = strlen(keyWords_char); j<len && index < (max_char-1); ++j)
{ {
if (!inSingleQuote && keyWords_char[j] == '"') if (!inSingleQuote && keyWords_char[j] == '"')
{ {