Add checks to verify that a plpgsql function returning a rowtype is actually

returning the rowtype it's supposed to return.  Per reports from David Niblett
and Michael Fuhr.

diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index 969c1c5d6f0dc4c384a11a974ccad14e0ac75c6e..588c880118f69f03f33bc02e69e64582ecd8d133 100644 (file)
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -382,10 +382,37 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo)
        {
                if (estate.retistuple)
                {
-                       /* Copy tuple to upper executor memory, as a tuple Datum */
+                       /*
+                        * We have to check that the returned tuple actually matches
+                        * the expected result type.
+                        */
+                       ReturnSetInfo *rsi = estate.rsi;
+                       TupleDesc       tupdesc;
+
+                       if (rsi && IsA(rsi, ReturnSetInfo) &&
+                               rsi->expectedDesc != NULL)
+                               tupdesc = rsi->expectedDesc;
+                       else if (estate.fn_rettype == RECORDOID)
+                       {
+                               /* assume caller can handle any record type */
+                               tupdesc = estate.rettupdesc;
+                       }
+                       else
+                               tupdesc = lookup_rowtype_tupdesc(estate.fn_rettype, -1);
+                       /* got the expected result rowtype, now check it */
+                       if (estate.rettupdesc == NULL ||
+                               !compatible_tupdesc(estate.rettupdesc, tupdesc))
+                               ereport(ERROR,
+                                               (errcode(ERRCODE_DATATYPE_MISMATCH),
+                                                errmsg("returned record type does not match expected record type")));
+
+                       /*
+                        * Copy tuple to upper executor memory, as a tuple Datum.
+                        * Make sure it is labeled with the caller-supplied tuple type.
+                        */
                        estate.retval =
                                PointerGetDatum(SPI_returntuple((HeapTuple) (estate.retval),
-                                                                                               estate.rettupdesc));
+                                                                                               tupdesc));
                }
                else
                {