Check after errors of SPI_execute() in xml.c

michaelpq · michaelpq · commit 3feb6ace7cfe · 2019-11-07T11:13:31.000+09:00
SPI gets used to build a list of relation OIDs for XML object generation, and one code path building a list uses SPI_execute() without looking at errors it produces. So fix that. Author: Mark Dilger Reviewed-by: Michael Paquier, Pavel Stehule Discussion: https://postgr.es/m/17d30445-4862-7917-170f-84328dcd292d@gmail.com
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
@@ -2461,8 +2461,12 @@ query_to_oid_list(const char *query)
 {
 	uint64		i;
 	List	   *list = NIL;
+	int			spi_result;
 
-	SPI_execute(query, true, 0);
+	spi_result = SPI_execute(query, true, 0);
+	if (spi_result != SPI_OK_SELECT)
+		elog(ERROR, "SPI_execute returned %s for %s",
+			 SPI_result_code_string(spi_result), query);
 
 	for (i = 0; i < SPI_processed; i++)
 	{

Original file line number	Diff line number	Diff line change
`@@ -2461,8 +2461,12 @@ query_to_oid_list(const char *query)`
`2461`	`2461`	`{`
`2462`	`2462`	`uint64 i;`
`2463`	`2463`	`List *list = NIL;`
	`2464`	`+ int spi_result;`
`2464`	`2465`
`2465`		`- SPI_execute(query, true, 0);`
	`2466`	`+ spi_result = SPI_execute(query, true, 0);`
	`2467`	`+ if (spi_result != SPI_OK_SELECT)`
	`2468`	`+ elog(ERROR, "SPI_execute returned %s for %s",`
	`2469`	`+ SPI_result_code_string(spi_result), query);`
`2466`	`2470`
`2467`	`2471`	`for (i = 0; i < SPI_processed; i++)`
`2468`	`2472`	`{`