Fix infinite loop on coloring $() in Makefile lexer, issue #302.

zufuliu · Mar 25, 2021 · cfc8faf · cfc8faf
1 parent 40fb08f
commit cfc8faf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scintilla/lexers/LexMakefile.cxx b/scintilla/lexers/LexMakefile.cxx
@@ -162,10 +162,10 @@ static void ColouriseMakeDoc(Sci_PositionU startPos, Sci_Position length, int in
 				state = SCE_MAKE_COMMENT;
 			} else if ((ch == '$' && chNext == '(') || (ch == '$' && chNext == '$' && styler.SafeGetCharAt(i + 2) == '(')) {
 				styler.ColourTo(i - 1, state);
-				Sci_Position pos = i + 1;
+				Sci_PositionU pos = i + 1;
 				if (chNext == '$') ++pos;
 				ch = chNext;
-				while (ch != ')') {
+				while (pos < endPos && ch != ')') {
 					chNext = styler.SafeGetCharAt(pos + 1);
 					if (ch == '$' && chNext == '(')
 						break;