postgres.git / summary / log / commit / refs
commit 2d481b31af5ec92a8b940cf8198c5197289aa61e
Author: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue Jul 12 20:35:42 2005 +0000
First released in: 8.1.0
Fix plperl crash with list value return for an array result type.
Reported by Michael Fuhr, fixed by Andrew Dunstan.
src/pl/plperl/plperl.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index 664688a32b9..3e97fb87557 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -33,7 +33,7 @@
* ENHANCEMENTS, OR MODIFICATIONS.
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.85 2005/07/12 01:16:21 tgl Exp $
+ * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.86 2005/07/12 20:35:42 tgl Exp $
*
**********************************************************************/
@@ -1020,8 +1020,8 @@ plperl_func_handler(PG_FUNCTION_ARGS)
/* Return a perl string converted to a Datum */
char *val;
-
- if (prodesc->fn_retisarray && SvTYPE(SvRV(perlret)) == SVt_PVAV)
+ if (prodesc->fn_retisarray && SvROK(perlret) &&
+ SvTYPE(SvRV(perlret)) == SVt_PVAV)
{
array_ret = plperl_convert_to_pg_array(perlret);
SvREFCNT_dec(perlret);
[parent: 807bbe6051de]