diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-07-16 12:12:19 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-07-16 12:12:19 +1000 |
| commit | 2365db5114cb4813853f334e3369c5ae72ac38c3 (patch) | |
| tree | 99fc05e01e39d86f07e17d734631f6cff545ad26 | |
| parent | a4d36c2b76d188199d9b16b4556d9aa88c412731 (diff) | |
| download | scintilla-mirror-2365db5114cb4813853f334e3369c5ae72ac38c3.tar.gz | |
Bug [#1622]. Don't crash with SGML after a Mako comment.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | lexers/LexHTML.cxx | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 9dfbe08f0..af074b880 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -481,6 +481,10 @@ "make clean". </li> <li> + HTML lexer fixes a crash with SGML after a Mako comment. + <a href="http://sourceforge.net/p/scintilla/bugs/1622/">Bug #1622</a>. + </li> + <li> KiXtart lexer adds a block comment state. <a href="http://sourceforge.net/p/scintilla/feature-requests/1053/">Feature #1053.</a> </li> diff --git a/lexers/LexHTML.cxx b/lexers/LexHTML.cxx index d6b0b31bc..4bc4b765b 100644 --- a/lexers/LexHTML.cxx +++ b/lexers/LexHTML.cxx @@ -828,13 +828,15 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty else if (isMako && makoComment && (ch == '\r' || ch == '\n')) { makoComment = 0; styler.ColourTo(i, SCE_HP_COMMENTLINE); - state = SCE_HP_DEFAULT; } // Allow falling through to mako handling code if newline is going to end a block if (((ch == '\r' && chNext != '\n') || (ch == '\n')) && (!isMako || (0 != strcmp(makoBlockType, "%")))) { } + // Ignore everything in mako comment until the line ends + else if (isMako && makoComment) { + } // generic end of script processing else if ((inScriptType == eNonHtmlScript) && (ch == '<') && (chNext == '/')) { |