Refactor using code from master used to fix CORE-6385.

asfernandes · asfernandes · commit dfcb0ba1a484 · 2021-01-30T23:10:12.000-03:00
Fix for CORE-6466 also fixed CORE-6385 in B3_0_Release.
diff --git a/src/dsql/Parser.h b/src/dsql/Parser.h
@@ -191,10 +191,7 @@ class Parser : public Firebird::PermanentStorage
 private:
 	template <typename T> T* setupNode(Node* node)
 	{
-		// Get line/column from YYPOSNARG(1)
-		const int posnArg = 1;
-		node->line = ((yyps->psp)[1 - yym + posnArg - 1]).firstLine;
-		node->column = ((yyps->psp)[1 - yym + posnArg - 1]).firstColumn;
+		setNodeLineColumn(node);
 		return static_cast<T*>(node);
 	}
 
@@ -339,6 +336,8 @@ class Parser : public Firebird::PermanentStorage
 	void yyMoreStack(yyparsestate* yyps);
 	yyparsestate* yyNewState(int size);
 
+	void setNodeLineColumn(Node* node);
+
 private:
 	int parseAux();
 	int yylex1();
diff --git a/src/dsql/btyacc_fb.ske b/src/dsql/btyacc_fb.ske
@@ -179,6 +179,17 @@ void Parser::yyFreeState(Parser::yyparsestate* p)
 }
 
 
+void Parser::setNodeLineColumn(Node* node)
+{
+	// Check if we are not accessing the position stack below its base.
+	if (&YYPOSNARG(1) >= yyps->ps)
+	{
+		node->line = YYPOSNARG(1).firstLine;
+		node->column = YYPOSNARG(1).firstColumn;
+	}
+}
+
+
 int Parser::parseAux()
 {
   // ASF: yym moved to Parser.h
