Fixed CORE-6340 - Alternate quoting does not work on some particular …

…cases.
FirebirdSQL · Jun 30, 2020 · 5d961c0 · 5d961c0
1 parent d54b13e
commit 5d961c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/dsql/Parser.cpp b/src/dsql/Parser.cpp
@@ -728,9 +728,9 @@ int Parser::yylexAux()
 
 		while (++lex.ptr + 1 < lex.end)
 		{
-			if (*lex.ptr == endChar && *++lex.ptr == '\'')
+			if (*lex.ptr == endChar && lex.ptr[1] == '\'')
 			{
-				size_t len = lex.ptr - lex.last_token - 4;
+				size_t len = ++lex.ptr - lex.last_token - 4;
 
 				if (len > MAX_STR_SIZE)
 				{

diff --git a/src/isql/isql.epp b/src/isql/isql.epp
@@ -5212,6 +5212,7 @@ static processing_state get_statement(Firebird::string& statement,
 
 	char lastChar = '\0';
 	char altQuoteChar = '\0';
+	unsigned altQuoteStringLength = 0;
 
 	while (!done)
 	{
@@ -5350,6 +5351,7 @@ static processing_state get_statement(Firebird::string& statement,
 					{
 						statement += (lastChar = c);
 						altQuoteChar = c = getNextInputChar();
+						altQuoteStringLength = statement.length();
 
 						switch (altQuoteChar)
 						{
@@ -5373,7 +5375,7 @@ static processing_state get_statement(Firebird::string& statement,
 					state = in_single_quoted_string;
 					break;
 				case in_single_quoted_string:
-					if (!altQuoteChar || lastChar == altQuoteChar)
+					if (!altQuoteChar || (statement.length() != altQuoteStringLength + 1 && lastChar == altQuoteChar))
 						state = normal;
 					break;
 			}