From: Demi Obenour <demiobenour@gmail.com>
Date: Wed, 3 May 2017 17:45:11 +0000 (-0400)
Subject: scanner: Check for 0 bracecount when EOL ends quoted literal.
X-Git-Tag: v2.6.4~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba530cd52fa2d69ddf7194459445a19fc9648014;p=flex

scanner: Check for 0 bracecount when EOL ends quoted literal.

This can happen in the case of // comments (which Flex doesn't handle
specially).
---

diff --git a/src/scan.l b/src/scan.l
index abe47f4..66db864 100644
--- a/src/scan.l
+++ b/src/scan.l
@@ -919,7 +919,7 @@ nmstr[yyleng - 2 - end_is_ws] = '\0';  /* chop trailing brace */
 	{NL}	{
 		++linenum;
 		ACTION_ECHO;
-		if (bracelevel == 0 || (doing_codeblock && indented_code)) {
+		if (bracelevel <= 0 || (doing_codeblock && indented_code)) {
             if ( doing_rule_action )
                 add_action( "\tYY_BREAK]""]\n" );
 
@@ -964,7 +964,7 @@ nmstr[yyleng - 2 - end_is_ws] = '\0';  /* chop trailing brace */
 <ACTION_STRING,CHARACTER_CONSTANT>{
         (\\\n)*         ACTION_ECHO;
 	\\(\\\n)*.	ACTION_ECHO;
-	{NL}	++linenum; ACTION_ECHO; BEGIN(ACTION);
+	{NL}	++linenum; ACTION_ECHO; if (bracelevel <= 0) { BEGIN(SECT2); } else { BEGIN(ACTION); }
         .	ACTION_ECHO;
 }