fix: add error handling for SPI calls in autonomous functions

rophy · rophy · commit a591a4898b61 · 2025-11-28T00:00:33.000Z
- Check SPI_connect() return value before proceeding
- Wrap SPI operations in PG_TRY/PG_CATCH to prevent memory leaks
- Add utils/datum.h include for datumCopy() function
- Ensure pfree(query) and SPI_finish() always execute on error paths
diff --git a/src/pl/plisql/src/pl_autonomous.c b/src/pl/plisql/src/pl_autonomous.c
@@ -22,6 +22,7 @@
 #include "parser/parse_func.h"
 #include "parser/parse_type.h"
 #include "utils/builtins.h"
+#include "utils/datum.h"
 #include "utils/guc.h"
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
@@ -342,36 +343,55 @@ execute_autonomous_function(char *connstr, char *sql, Oid rettype, FunctionCallI
 					 quote_literal_cstr(sql),
 					 format_type_be(rettype));
 
-	/* Execute via SPI */
-	SPI_connect();
+	/* Execute via SPI with proper error handling */
+	PG_TRY();
+	{
+		/* Connect to SPI */
+		ret = SPI_connect();
+		if (ret < 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_INTERNAL_ERROR),
+					 errmsg("could not connect to SPI for autonomous function execution"),
+					 errdetail("SPI_connect returned %d", ret)));
 
-	ret = SPI_execute(query, true, 1);
-	if (ret != SPI_OK_SELECT)
-		ereport(ERROR,
-				(errcode(ERRCODE_INTERNAL_ERROR),
-				 errmsg("autonomous function execution failed"),
-				 errdetail("SPI_execute returned %d", ret)));
+		/* Execute the query */
+		ret = SPI_execute(query, true, 1);
+		if (ret != SPI_OK_SELECT)
+			ereport(ERROR,
+					(errcode(ERRCODE_INTERNAL_ERROR),
+					 errmsg("autonomous function execution failed"),
+					 errdetail("SPI_execute returned %d", ret)));
 
-	if (SPI_processed != 1)
-		ereport(ERROR,
-				(errcode(ERRCODE_INTERNAL_ERROR),
-				 errmsg("autonomous function returned unexpected number of rows: %lu",
-						(unsigned long) SPI_processed)));
+		if (SPI_processed != 1)
+			ereport(ERROR,
+					(errcode(ERRCODE_INTERNAL_ERROR),
+					 errmsg("autonomous function returned unexpected number of rows: %lu",
+							(unsigned long) SPI_processed)));
+
+		/* Extract return value from result */
+		result = SPI_getbinval(SPI_tuptable->vals[0],
+							  SPI_tuptable->tupdesc,
+							  1,
+							  &isnull);
 
-	/* Extract return value from result */
-	result = SPI_getbinval(SPI_tuptable->vals[0],
-						  SPI_tuptable->tupdesc,
-						  1,
-						  &isnull);
+		/* Get type information for datumCopy */
+		get_typlenbyval(rettype, &typlen, &typbyval);
 
-	/* Get type information for datumCopy */
-	get_typlenbyval(rettype, &typlen, &typbyval);
+		/* Copy result to upper context before SPI_finish frees SPI memory */
+		if (!isnull && !typbyval)
+			result = datumCopy(result, typbyval, typlen);
 
-	/* Copy result to upper context before SPI_finish frees SPI memory */
-	if (!isnull && !typbyval)
-		result = datumCopy(result, typbyval, typlen);
+		SPI_finish();
+	}
+	PG_CATCH();
+	{
+		/* Clean up on error */
+		SPI_finish();
+		pfree(query);
+		PG_RE_THROW();
+	}
+	PG_END_TRY();
 
-	SPI_finish();
 	pfree(query);
 
 	fcinfo->isnull = isnull;
