Don't crash when a rowtype argument to a plpgsql function is NULL.
Per report from Chris Campbell.
This commit is contained in:
parent
3f2cf812af
commit
55fb172739
|
@ -3,7 +3,7 @@
|
||||||
* procedural language
|
* procedural language
|
||||||
*
|
*
|
||||||
* IDENTIFICATION
|
* IDENTIFICATION
|
||||||
* $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.95 2004/02/03 17:34:04 tgl Exp $
|
* $PostgreSQL: pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.96 2004/02/24 01:44:33 tgl Exp $
|
||||||
*
|
*
|
||||||
* This software is copyrighted by Jan Wieck - Hamburg.
|
* This software is copyrighted by Jan Wieck - Hamburg.
|
||||||
*
|
*
|
||||||
|
@ -262,10 +262,18 @@ plpgsql_exec_function(PLpgSQL_function * func, FunctionCallInfo fcinfo)
|
||||||
HeapTuple tup;
|
HeapTuple tup;
|
||||||
TupleDesc tupdesc;
|
TupleDesc tupdesc;
|
||||||
|
|
||||||
Assert(slot != NULL && !fcinfo->argnull[i]);
|
if (!fcinfo->argnull[i])
|
||||||
tup = slot->val;
|
{
|
||||||
tupdesc = slot->ttc_tupleDescriptor;
|
Assert(slot != NULL);
|
||||||
exec_move_row(&estate, NULL, row, tup, tupdesc);
|
tup = slot->val;
|
||||||
|
tupdesc = slot->ttc_tupleDescriptor;
|
||||||
|
exec_move_row(&estate, NULL, row, tup, tupdesc);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* If arg is null, treat it as an empty row */
|
||||||
|
exec_move_row(&estate, NULL, row, NULL, NULL);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue