dblink: Fix error reporting

petere · petere · commit 85163641f8bd · 2017-03-28T11:08:38.000-04:00
The conname variable was not initialized in some code paths, resulting
in error reports referring to the "unnamed" connection rather than the
correct connection name.

Author: Rushabh Lathia &lt;rushabh.lathia@gmail.com&gt;
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
@@ -687,23 +687,25 @@ dblink_record_internal(FunctionCallInfo fcinfo, bool is_async)
 			if (PG_NARGS() == 3)
 			{
 				/* text,text,bool */
-				dblink_get_conn(text_to_cstring(PG_GETARG_TEXT_PP(0)), &conn, &conname, &freeconn);
+				conname = text_to_cstring(PG_GETARG_TEXT_PP(0));
 				sql = text_to_cstring(PG_GETARG_TEXT_PP(1));
 				fail = PG_GETARG_BOOL(2);
+				dblink_get_conn(conname, &conn, &conname, &freeconn);
 			}
 			else if (PG_NARGS() == 2)
 			{
 				/* text,text or text,bool */
 				if (get_fn_expr_argtype(fcinfo->flinfo, 1) == BOOLOID)
 				{
-					conn = pconn->conn;
 					sql = text_to_cstring(PG_GETARG_TEXT_PP(0));
 					fail = PG_GETARG_BOOL(1);
+					conn = pconn->conn;
 				}
 				else
 				{
-					dblink_get_conn(text_to_cstring(PG_GETARG_TEXT_PP(0)), &conn, &conname, &freeconn);
+					conname = text_to_cstring(PG_GETARG_TEXT_PP(0));
 					sql = text_to_cstring(PG_GETARG_TEXT_PP(1));
+					dblink_get_conn(conname, &conn, &conname, &freeconn);
 				}
 			}
 			else if (PG_NARGS() == 1)
@@ -719,16 +721,18 @@ dblink_record_internal(FunctionCallInfo fcinfo, bool is_async)
 		else	/* is_async */
 		{
 			/* get async result */
+			conname = text_to_cstring(PG_GETARG_TEXT_PP(0));
+
 			if (PG_NARGS() == 2)
 			{
 				/* text,bool */
-				conn = dblink_get_named_conn(text_to_cstring(PG_GETARG_TEXT_PP(0)));
 				fail = PG_GETARG_BOOL(1);
+				conn = dblink_get_named_conn(conname);
 			}
 			else if (PG_NARGS() == 1)
 			{
 				/* text */
-				conn = dblink_get_named_conn(text_to_cstring(PG_GETARG_TEXT_PP(0)));
+				conn = dblink_get_named_conn(conname);
 			}
 			else
 				/* shouldn't happen */
@@ -1390,23 +1394,25 @@ dblink_exec(PG_FUNCTION_ARGS)
 		if (PG_NARGS() == 3)
 		{
 			/* must be text,text,bool */
-			dblink_get_conn(text_to_cstring(PG_GETARG_TEXT_PP(0)), &conn, &conname, &freeconn);
+			conname = text_to_cstring(PG_GETARG_TEXT_PP(0));
 			sql = text_to_cstring(PG_GETARG_TEXT_PP(1));
 			fail = PG_GETARG_BOOL(2);
+			dblink_get_conn(conname, &conn, &conname, &freeconn);
 		}
 		else if (PG_NARGS() == 2)
 		{
 			/* might be text,text or text,bool */
 			if (get_fn_expr_argtype(fcinfo->flinfo, 1) == BOOLOID)
 			{
-				conn = pconn->conn;
 				sql = text_to_cstring(PG_GETARG_TEXT_PP(0));
 				fail = PG_GETARG_BOOL(1);
+				conn = pconn->conn;
 			}
 			else
 			{
-				dblink_get_conn(text_to_cstring(PG_GETARG_TEXT_PP(0)), &conn, &conname, &freeconn);
+				conname = text_to_cstring(PG_GETARG_TEXT_PP(0));
 				sql = text_to_cstring(PG_GETARG_TEXT_PP(1));
+				dblink_get_conn(conname, &conn, &conname, &freeconn);
 			}
 		}
 		else if (PG_NARGS() == 1)

Original file line number	Diff line number	Diff line change
`@@ -687,23 +687,25 @@ dblink_record_internal(FunctionCallInfo fcinfo, bool is_async)`
`687`	`687`	`if (PG_NARGS() == 3)`
`688`	`688`	`{`
`689`	`689`	`/* text,text,bool */`
`690`		`- dblink_get_conn(text_to_cstring(PG_GETARG_TEXT_PP(0)), &conn, &conname, &freeconn);`
	`690`	`+ conname = text_to_cstring(PG_GETARG_TEXT_PP(0));`
`691`	`691`	`sql = text_to_cstring(PG_GETARG_TEXT_PP(1));`
`692`	`692`	`fail = PG_GETARG_BOOL(2);`
	`693`	`+ dblink_get_conn(conname, &conn, &conname, &freeconn);`
`693`	`694`	`}`
`694`	`695`	`else if (PG_NARGS() == 2)`
`695`	`696`	`{`
`696`	`697`	`/* text,text or text,bool */`
`697`	`698`	`if (get_fn_expr_argtype(fcinfo->flinfo, 1) == BOOLOID)`
`698`	`699`	`{`
`699`		`- conn = pconn->conn;`
`700`	`700`	`sql = text_to_cstring(PG_GETARG_TEXT_PP(0));`
`701`	`701`	`fail = PG_GETARG_BOOL(1);`
	`702`	`+ conn = pconn->conn;`
`702`	`703`	`}`
`703`	`704`	`else`
`704`	`705`	`{`
`705`		`- dblink_get_conn(text_to_cstring(PG_GETARG_TEXT_PP(0)), &conn, &conname, &freeconn);`
	`706`	`+ conname = text_to_cstring(PG_GETARG_TEXT_PP(0));`
`706`	`707`	`sql = text_to_cstring(PG_GETARG_TEXT_PP(1));`
	`708`	`+ dblink_get_conn(conname, &conn, &conname, &freeconn);`
`707`	`709`	`}`
`708`	`710`	`}`
`709`	`711`	`else if (PG_NARGS() == 1)`
`@@ -719,16 +721,18 @@ dblink_record_internal(FunctionCallInfo fcinfo, bool is_async)`
`719`	`721`	`else /* is_async */`
`720`	`722`	`{`
`721`	`723`	`/* get async result */`
	`724`	`+ conname = text_to_cstring(PG_GETARG_TEXT_PP(0));`
	`725`	`+`
`722`	`726`	`if (PG_NARGS() == 2)`
`723`	`727`	`{`
`724`	`728`	`/* text,bool */`
`725`		`- conn = dblink_get_named_conn(text_to_cstring(PG_GETARG_TEXT_PP(0)));`
`726`	`729`	`fail = PG_GETARG_BOOL(1);`
	`730`	`+ conn = dblink_get_named_conn(conname);`
`727`	`731`	`}`
`728`	`732`	`else if (PG_NARGS() == 1)`
`729`	`733`	`{`
`730`	`734`	`/* text */`
`731`		`- conn = dblink_get_named_conn(text_to_cstring(PG_GETARG_TEXT_PP(0)));`
	`735`	`+ conn = dblink_get_named_conn(conname);`
`732`	`736`	`}`
`733`	`737`	`else`
`734`	`738`	`/* shouldn't happen */`
`@@ -1390,23 +1394,25 @@ dblink_exec(PG_FUNCTION_ARGS)`
`1390`	`1394`	`if (PG_NARGS() == 3)`
`1391`	`1395`	`{`
`1392`	`1396`	`/* must be text,text,bool */`
`1393`		`- dblink_get_conn(text_to_cstring(PG_GETARG_TEXT_PP(0)), &conn, &conname, &freeconn);`
	`1397`	`+ conname = text_to_cstring(PG_GETARG_TEXT_PP(0));`
`1394`	`1398`	`sql = text_to_cstring(PG_GETARG_TEXT_PP(1));`
`1395`	`1399`	`fail = PG_GETARG_BOOL(2);`
	`1400`	`+ dblink_get_conn(conname, &conn, &conname, &freeconn);`
`1396`	`1401`	`}`
`1397`	`1402`	`else if (PG_NARGS() == 2)`
`1398`	`1403`	`{`
`1399`	`1404`	`/* might be text,text or text,bool */`
`1400`	`1405`	`if (get_fn_expr_argtype(fcinfo->flinfo, 1) == BOOLOID)`
`1401`	`1406`	`{`
`1402`		`- conn = pconn->conn;`
`1403`	`1407`	`sql = text_to_cstring(PG_GETARG_TEXT_PP(0));`
`1404`	`1408`	`fail = PG_GETARG_BOOL(1);`
	`1409`	`+ conn = pconn->conn;`
`1405`	`1410`	`}`
`1406`	`1411`	`else`
`1407`	`1412`	`{`
`1408`		`- dblink_get_conn(text_to_cstring(PG_GETARG_TEXT_PP(0)), &conn, &conname, &freeconn);`
	`1413`	`+ conname = text_to_cstring(PG_GETARG_TEXT_PP(0));`
`1409`	`1414`	`sql = text_to_cstring(PG_GETARG_TEXT_PP(1));`
	`1415`	`+ dblink_get_conn(conname, &conn, &conname, &freeconn);`
`1410`	`1416`	`}`
`1411`	`1417`	`}`
`1412`	`1418`	`else if (PG_NARGS() == 1)`