Fixed CORE-6385 - Wrong line and column information after IF statement.

asfernandes · asfernandes · commit 1d7038499a6a · 2020-08-09T19:26:26.000-03:00
diff --git a/src/dsql/Parser.h b/src/dsql/Parser.h
@@ -201,8 +201,7 @@ class Parser : public Firebird::PermanentStorage
 private:
 	template <typename T> T* setupNode(Node* node)
 	{
-		node->line = yyposn.firstLine;
-		node->column = yyposn.firstColumn;
+		setNodeLineColumn(node);
 		return static_cast<T*>(node);
 	}
 
@@ -365,6 +364,8 @@ class Parser : public Firebird::PermanentStorage
 	void yyMoreStack(yyparsestate* yyps);
 	yyparsestate* yyNewState(int size);
 
+	void setNodeLineColumn(Node* node);
+
 private:
 	int parseAux();
 	int yylex1();
@@ -392,6 +393,7 @@ class Parser : public Firebird::PermanentStorage
 	Position yyretposn;
 
 	int yynerrs;
+	int yym;
 
 	// Current parser state
 	yyparsestate* yyps;
diff --git a/src/dsql/btyacc_fb.ske b/src/dsql/btyacc_fb.ske
@@ -179,9 +179,20 @@ 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()
 {
-  int yym, yyn, yystate, yychar, yynewerrflag;
+  int yyn, yystate, yychar, yynewerrflag;
   yyparsestate *yyerrctx = NULL;
   int reduce_posn;
 
@@ -552,9 +563,6 @@ yyreduce:
 
   reduce_posn = TRUE;
 
-  yyposn.firstLine = YYPOSNARG(1).firstLine;
-  yyposn.firstColumn = YYPOSNARG(1).firstColumn;
-
   switch (yyn) {
 
 %% trailer
