mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-09 08:10:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add some defenses against functions declared to return set that don't

Browse Source 
actually follow the protocol; per example from Kris Jurka.
This commit is contained in:
Tom Lane 2005-05-09 14:28:39 +00:00
parent 4744c1a0a1
commit 1198d63397
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/executor/execQual.c
View File

@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.177 2005/05/06 17:24:53 tgl Exp $
* $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.178 2005/05/09 14:28:39 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -948,7 +948,7 @@ ExecMakeFunctionResult(FuncExprState *fcache,
* returns set, save the current argument values to re-use
* on the next call.
*/
if (fcache->func.fn_retset)
if (fcache->func.fn_retset && *isDone == ExprMultipleResult)
{
memcpy(&fcache->setArgs, &fcinfo, sizeof(fcinfo));
fcache->setHasSetArg = hasSetArg;
@ -967,7 +967,8 @@ ExecMakeFunctionResult(FuncExprState *fcache,
* Make sure we say we are returning a set, even if the
* function itself doesn't return sets.
*/
*isDone = ExprMultipleResult;
if (hasSetArg)
*isDone = ExprMultipleResult;
break;
}