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

UDL lexer: fix potential infinite loop 

Fixed a condition in a loop which is always true (unsigned >= 0) and can
potentially turn the loop infinite.

And removed a check after the loop which now is also always false.

Close #10597
This commit is contained in:
Ivan Ustûžanin 2021-09-25 11:55:57 +03:00 committed by Don Ho
parent 4d57f5071f
commit 49c3e5d553
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
scintilla/lexers/LexUser.cxx
View File

@ -786,20 +786,20 @@ static inline void ReColoringCheck(Sci_PositionU & startPos, int & nestedLevel,
int & isCommentLine, bool & isInComment, Accessor & styler, vector<nestedInfo> & lastNestedGroup, int & isCommentLine, bool & isInComment, Accessor & styler, vector<nestedInfo> & lastNestedGroup,
vector<nestedInfo> & nestedVector, /* vector<int> & foldVector, */ int & continueCommentBlock) vector<nestedInfo> & nestedVector, /* vector<int> & foldVector, */ int & continueCommentBlock)
{ {
// re-coloring always starts at line beginning !! if (startPos > 0)
// special exception for multipart keywords
initStyle = styler.StyleAt(startPos-1); // check style of previous new line character
if ( (initStyle >= SCE_USER_STYLE_KEYWORD1 && initStyle < (SCE_USER_STYLE_KEYWORD1+SCE_USER_TOTAL_KEYWORD_GROUPS)) // keywords1-8
|| initStyle == SCE_USER_STYLE_FOLDER_IN_COMMENT
|| initStyle == SCE_USER_STYLE_FOLDER_IN_CODE2 )
{ {
// we are in middle of multi-part keyword that contains newline characters, go back until current style ends // re-coloring always starts at line beginning !!
while (startPos >= 0 && styler.StyleAt(--startPos) == initStyle);
}
if (static_cast<int>(startPos) < 0) // special exception for multipart keywords
startPos = 0; initStyle = styler.StyleAt(startPos-1); // check style of previous new line character
if ( (initStyle >= SCE_USER_STYLE_KEYWORD1 && initStyle < (SCE_USER_STYLE_KEYWORD1+SCE_USER_TOTAL_KEYWORD_GROUPS)) // keywords1-8
|| initStyle == SCE_USER_STYLE_FOLDER_IN_COMMENT
|| initStyle == SCE_USER_STYLE_FOLDER_IN_CODE2 )
{
// we are in middle of multi-part keyword that contains newline characters, go back until current style ends
while (startPos > 0 && styler.StyleAt(--startPos) == initStyle);
}
}
if (startPos > 0) if (startPos > 0)
{ {
@ -808,8 +808,6 @@ static inline void ReColoringCheck(Sci_PositionU & startPos, int & nestedLevel,
do do
{ {
ch = styler.SafeGetCharAt(--startPos); ch = styler.SafeGetCharAt(--startPos);
if (startPos == -1)
startPos = 0;
} }
while(ch != '\r' && ch != '\n' && startPos > 0); while(ch != '\r' && ch != '\n' && startPos > 0);