diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-02-24 01:44:58 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-02-24 01:44:58 +0000 |
| commit | d301dcbe30fe3ad326db877cc1d8cbf970e6f702 (patch) | |
| tree | d9a831c5e43ce6ac61d999c06faffb9d4136360a | |
| parent | 8fd0eb8c7a51fa7f97f30a9efeba1321873ba22c (diff) | |
| download | postgresql-d301dcbe30fe3ad326db877cc1d8cbf970e6f702.tar.gz postgresql-d301dcbe30fe3ad326db877cc1d8cbf970e6f702.zip | |
Don't crash when a rowtype argument to a plpgsql function is NULL.
Per report from Chris Campbell.
| -rw-r--r-- | src/pl/plpgsql/src/pl_exec.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c index 2c3c8aa7c7e..95306967cac 100644 --- a/src/pl/plpgsql/src/pl_exec.c +++ b/src/pl/plpgsql/src/pl_exec.c @@ -3,7 +3,7 @@ * procedural language * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.65.2.2 2003/03/02 20:45:59 tgl Exp $ + * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_exec.c,v 1.65.2.3 2004/02/24 01:44:58 tgl Exp $ * * This software is copyrighted by Jan Wieck - Hamburg. * @@ -265,10 +265,18 @@ plpgsql_exec_function(PLpgSQL_function * func, FunctionCallInfo fcinfo) HeapTuple tup; TupleDesc tupdesc; - Assert(slot != NULL && !fcinfo->argnull[i]); - tup = slot->val; - tupdesc = slot->ttc_tupleDescriptor; - exec_move_row(&estate, NULL, row, tup, tupdesc); + if (!fcinfo->argnull[i]) + { + Assert(slot != NULL); + 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; |