Let ExtDS preprocessor and SQL parser handle '\r', '\n' and '\r\n' as…

… end of line. It should fix bug CORE-5783 : execute statement ignores the text of the SQL-query after a comment of the form "-"
FirebirdSQL · Apr 2, 2018 · a9b8442 · a9b8442
1 parent 07a9515
commit a9b8442
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 23 deletions.
diff --git a/src/dsql/Parser.cpp b/src/dsql/Parser.cpp
@@ -323,30 +323,22 @@ bool Parser::yylexSkipSpaces()
 		if (lex.ptr >= lex.end)
 			return false;
 
-		c = *lex.ptr++;
+		if (yylexSkipEol())
+			continue;
 
 		// Process comments
 
-		if (c == '\n')
-		{
-			lex.lines++;
-			lex.line_start = lex.ptr;
-			continue;
-		}
-
+		c = *lex.ptr++;
 		if (c == '-' && lex.ptr < lex.end && *lex.ptr == '-')
 		{
 			// single-line
 
 			lex.ptr++;
 			while (lex.ptr < lex.end)
 			{
-				if ((c = *lex.ptr++) == '\n')
-				{
-					lex.lines++;
-					lex.line_start = lex.ptr; // + 1; // CVC: +1 left out.
+				lex.ptr++;
+				if (yylexSkipEol())
 					break;
-				}
 			}
 			if (lex.ptr >= lex.end)
 				return false;
@@ -361,17 +353,14 @@ bool Parser::yylexSkipSpaces()
 			lex.ptr++;
 			while (lex.ptr < lex.end)
 			{
+				if (yylexSkipEol())
+					continue;
+
 				if ((c = *lex.ptr++) == '*')
 				{
 					if (*lex.ptr == '/')
 						break;
 				}
-				if (c == '\n')
-				{
-					lex.lines++;
-					lex.line_start = lex.ptr; // + 1; // CVC: +1 left out.
-
-				}
 			}
 			if (lex.ptr >= lex.end)
 			{
@@ -395,6 +384,34 @@ bool Parser::yylexSkipSpaces()
 }
 
 
+bool Parser::yylexSkipEol()
+{
+	bool eol = false;
+	const TEXT c = *lex.ptr;
+	if (c == '\r')
+	{
+		lex.ptr++;
+		if (lex.ptr < lex.end && *lex.ptr == '\n')
+			lex.ptr++;
+
+		eol = true;
+	}
+	else if (c == '\n')
+	{
+		lex.ptr++;
+		eol = true;
+	}
+
+	if (eol)
+	{
+		lex.lines++;
+		lex.line_start = lex.ptr; // + 1; // CVC: +1 left out.
+	}
+
+	return eol;
+}
+
+
 int Parser::yylexAux()
 {
 	thread_db* tdbb = JRD_get_thread_data();

diff --git a/src/dsql/Parser.h b/src/dsql/Parser.h
@@ -223,6 +223,7 @@ class Parser : public Firebird::PermanentStorage
 
 	int yylex();
 	bool yylexSkipSpaces();
+	bool yylexSkipEol();	// returns true if EOL is detected and skipped
 	int yylexAux();
 
 	void yyerror(const TEXT* error_string);

diff --git a/src/jrd/extds/ExtDS.cpp b/src/jrd/extds/ExtDS.cpp
@@ -1067,15 +1067,19 @@ static TokenType getToken(const char** begin, const char* end)
 	case '-':
 		if (p < end && *p == '-')
 		{
-			while (p < end)
+			while (++p < end)
 			{
-				if (*p++ == '\n')
+				if (*p == '\r')
 				{
-					p--;
-					ret = ttComment;
+					p++;
+					if (p < end && *p == '\n')
+						p++;
 					break;
 				}
+				else if (*p == '\n')
+					break;
 			}
+			ret = ttComment;
 		}
 		else {
 			ret = ttOther;