Added missing braces to prevent a segfault after usage of an undeclared cursor.

Michael Meskes · Michael Meskes · commit 4b98d423d776 · 2006-06-26T14:12:02.000Z
diff --git a/src/interfaces/ecpg/ChangeLog b/src/interfaces/ecpg/ChangeLog
@@ -2035,5 +2035,10 @@ Mo Jun 26 11:05:25 CEST 2006
 
 	- Added some more coverity report patches send in by Joachim Wieland
 	  <joe@mcknight.de>.
+
+Mo Jun 26 16:08:23 CEST 2006
+
+	- Added missing braces to prevent a segfault after usage of an
+	  undeclared cursor.
 	- Set ecpg library version to 5.2.
 	- Set ecpg version to 4.2.1.
diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y
@@ -1,4 +1,4 @@
-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.324 2006/06/06 11:31:55 meskes Exp $ */
+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.325 2006/06/26 14:12:02 meskes Exp $ */
 
 /* Copyright comment */
 %{
@@ -292,6 +292,7 @@ add_additional_variables(char *name, bool insert)
 		mmerror(PARSE_ERROR, ET_ERROR, "trying to access an undeclared cursor %s\n", name);
 		return NULL;
 	}
+
 	if (insert)
 	{
 		/* add all those input variables that were given earlier
@@ -837,9 +838,11 @@ stmt:  AlterDatabaseStmt		{ output_statement($1, 0, connection); }
 			struct cursor *ptr;
 
 			if ((ptr = add_additional_variables($1, true)) != NULL)
+			{
 				output_statement(mm_strdup(ptr->command), 0,
 								 ptr->connection ? mm_strdup(ptr->connection) : NULL);
-			ptr->opened = true;
+				ptr->opened = true;
+			}
 		}
 		| ECPGPrepare
 		{

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.324 2006/06/06 11:31:55 meskes Exp $ */`
	`1`	`+/* $PostgreSQL: pgsql/src/interfaces/ecpg/preproc/preproc.y,v 1.325 2006/06/26 14:12:02 meskes Exp $ */`
`2`	`2`
`3`	`3`	`/* Copyright comment */`
`4`	`4`	`%{`
`@@ -292,6 +292,7 @@ add_additional_variables(char *name, bool insert)`
`292`	`292`	`mmerror(PARSE_ERROR, ET_ERROR, "trying to access an undeclared cursor %s\n", name);`
`293`	`293`	`return NULL;`
`294`	`294`	`}`
	`295`	`+`
`295`	`296`	`if (insert)`
`296`	`297`	`{`
`297`	`298`	`/* add all those input variables that were given earlier`
`@@ -837,9 +838,11 @@ stmt: AlterDatabaseStmt { output_statement($1, 0, connection); }`
`837`	`838`	`struct cursor *ptr;`
`838`	`839`
`839`	`840`	`if ((ptr = add_additional_variables($1, true)) != NULL)`
	`841`	`+ {`
`840`	`842`	`output_statement(mm_strdup(ptr->command), 0,`
`841`	`843`	`ptr->connection ? mm_strdup(ptr->connection) : NULL);`
`842`		`- ptr->opened = true;`
	`844`	`+ ptr->opened = true;`
	`845`	`+ }`
`843`	`846`	`}`
`844`	`847`	`\| ECPGPrepare`
`845`	`848`	`{`