More correct fix for bug CORE-2420 : Parsing error in EXECUTE STATEME…

…NT with named parameters.
FirebirdSQL · Apr 13, 2009 · 2821d80 · 2821d80
1 parent 9ad0dd6
commit 2821d80
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/jrd/extds/ExtDS.cpp b/src/jrd/extds/ExtDS.cpp
@@ -1004,16 +1004,16 @@ static TokenType getToken(const char **begin, const char *end)
 		else if (classes(c) & CHR_WHITE)
 		{
 			while (p < end && (classes(*p) & CHR_WHITE))
-				*p++;
+				p++;
 			ret = ttWhite;
 		}
 		else
 		{
-			c = *p;
-			while (p < end && !( classes(c) & (CHR_DIGIT | CHR_IDENT | CHR_WHITE) ) &&
-				c != '/' && c != '-' && c != ':' && c != '?' && c != '\'' && c != '"')
+			while (p < end && !( classes(*p) & (CHR_DIGIT | CHR_IDENT | CHR_WHITE) ) &&
+				   (*p != '/') && (*p != '-') && (*p != ':') && (*p != '?') && 
+				   (*p != '\'') && (*p != '"') )
 			{
-				c = *++p;
+				p++;
 			}
 			ret = ttOther;
 		}