tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a crash in UDL 

Fix infinite loop while lexing UDL multi-part keyword in prefix mode.

Fix #11434, close #11543
This commit is contained in:
SnipUndercover 2022-04-17 00:02:08 +02:00 committed by Don Ho
parent b57254aece
commit 3f322faf62
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lexilla/lexers/LexUser.cxx
View File

@ -1061,9 +1061,10 @@ static bool isInListBackward(WordList & list, StyleContext & sc, bool specialMod
} }
// skip next "word" (if next word is not found, go back to end of multi-part keyword) // skip next "word" (if next word is not found, go back to end of multi-part keyword)
// it is not necessary to check EOF position here, because sc.GetRelative returns ' ' beyond EOF // it is not necessary to check EOF position here, because sc.GetRelative returns '\0' beyond EOF by default
// return ' ' on EOF instead to not loop indefinitely
bool nextWordFound = false; bool nextWordFound = false;
while (!isWhiteSpace2(sc.GetRelative(indexb + offset), nlCountTemp, wsChar, sc.GetRelative(offset + indexb + 1))) while (!isWhiteSpace2(sc.GetRelative(indexb + offset, ' '), nlCountTemp, wsChar, sc.GetRelative(offset + indexb + 1, ' ')))
{ {
if (isInListForward2(fwEndVectors, FW_VECTORS_TOTAL, sc, ignoreCase, indexb + offset)) if (isInListForward2(fwEndVectors, FW_VECTORS_TOTAL, sc, ignoreCase, indexb + offset))
{ {