Fix crash for empty documentation comment keyword where '<' occurs…

… at line end.
ScintillaOrg · Oct 17, 2024 · 5bd3f0f · 5bd3f0f
1 parent 0784d05
commit 5bd3f0f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 2 deletions.
diff --git a/doc/Lexilla.html b/doc/Lexilla.html
@@ -77,7 +77,7 @@
       </tr>
     </table>
     <ul id="versionlist">
-      <li>Version 5.4.1 adds Dart, troff, and Zig lexers. Improves F#, HTML, and Smalltalk.</li>
+      <li>Version 5.4.1 adds Dart, troff, and Zig lexers. Improves C++, F#, HTML, and Smalltalk.</li>
       <li>Version 5.4.0 adds a TOML lexer.</li>
       <li>Version 5.3.3 improves HTML, JavaScript, Lua, PHP, and XML.</li>
       <li>Version 5.3.2 improves COBOL, HTML, Lua, Ruby, and Rust.</li>

diff --git a/doc/LexillaHistory.html b/doc/LexillaHistory.html
@@ -611,6 +611,9 @@ <h3>
 	<a href="https://github.com/ScintillaOrg/lexilla/pull/267">Pull request #267</a>.
 	</li>
 	<li>
+	C++: Fix crash for empty documentation comment keyword where '&lt;' occurs at line end.
+	</li>
+	<li>
 	F#: Include EOLs in the style range of SCE_FSHARP_COMMENTLINE.
 	Stabilizes EOL detection when folding line comment groups.
 	<a href="https://github.com/ScintillaOrg/lexilla/issues/276">Issue #276</a>.

diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
@@ -1073,7 +1073,7 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i
 						styleBeforeDCKeyword = SCE_C_COMMENTDOC;
 						sc.SetState(SCE_C_COMMENTDOCKEYWORD|activitySet);
 					}
-				} else if ((sc.ch == '<' && sc.chNext != '/')
+				} else if ((sc.ch == '<' && !(IsASpace(sc.chNext) || sc.chNext == '/'))
 							|| (sc.ch == '/' && sc.chPrev == '<')) { // XML comment style
 					styleBeforeDCKeyword = SCE_C_COMMENTDOC;
 					sc.ForwardSetState(SCE_C_COMMENTDOCKEYWORD | activitySet);

diff --git a/test/examples/cpp/x.cxx b/test/examples/cpp/x.cxx
@@ -24,6 +24,8 @@ b
 /** Unknown doc keywords so in SCE_C_COMMENTDOCKEYWORDERROR:
  @wrong LexCPP.cxx
  <wrong>filename</wrong>
+ Next line should not start a keyword but before 5.4.1 did and caused bad styling or a crash depending on range lexed
+ <
 **/
 
 #define M\

diff --git a/test/examples/cpp/x.cxx.folded b/test/examples/cpp/x.cxx.folded
@@ -24,6 +24,8 @@
  2 400 401 + /** Unknown doc keywords so in SCE_C_COMMENTDOCKEYWORDERROR:
  0 401 401 |  @wrong LexCPP.cxx
  0 401 401 |  <wrong>filename</wrong>
+ 0 401 401 |  Next line should not start a keyword but before 5.4.1 did and caused bad styling or a crash depending on range lexed
+ 0 401 401 |  <
  0 401 400 | **/
  1 400 400   
  0 400 400   #define M\

diff --git a/test/examples/cpp/x.cxx.styled b/test/examples/cpp/x.cxx.styled
@@ -24,6 +24,8 @@
 {3}/** Unknown doc keywords so in SCE_C_COMMENTDOCKEYWORDERROR:
  {18}@wrong{3} LexCPP.cxx
  <{18}wrong{3}>filename</{18}wrong{3}>
+ Next line should not start a keyword but before 5.4.1 did and caused bad styling or a crash depending on range lexed
+ <
 **/{0}
 
 {9}#define M\