diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index fbc8e78..371680a 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -3170,18 +3170,24 @@ exec_stmt_execsql(PLpgSQL_execstate *estate, if (n == 0) { if (stmt->strict) + { + SPI_freetuptable(SPI_tuptable); ereport(ERROR, (errcode(ERRCODE_NO_DATA_FOUND), errmsg("query returned no rows"))); + } /* set the target to NULL(s) */ exec_move_row(estate, rec, row, NULL, tuptab->tupdesc); } else { if (n > 1 && (stmt->strict || stmt->mod_stmt)) + { + SPI_freetuptable(SPI_tuptable); ereport(ERROR, (errcode(ERRCODE_TOO_MANY_ROWS), errmsg("query returned more than one row"))); + } /* Put the first result row into the target */ exec_move_row(estate, rec, row, tuptab->vals[0], tuptab->tupdesc); }