database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-21 10:42:50 +03:00
Code Activity

Fix incorrect tests for undef Perl values in some places in plperl.c.

Browse Source 
The correct test for defined-ness is SvOK(sv), not anything involving
SvTYPE.  Per bug #3415 from Matt Taylor.
Back-patch as far as 8.0; no apparent problem in 7.x.
This commit is contained in:
Tom Lane
2007-06-28 17:50:24 +00:00
parent b0bbcbe7d3
commit 71db4c703f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pl/plperl/plperl.c
View File

@@ -33,7 +33,7 @@
* ENHANCEMENTS, OR MODIFICATIONS. * ENHANCEMENTS, OR MODIFICATIONS.
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.67.4.6 2006/01/28 16:22:49 adunstan Exp $ * $PostgreSQL: pgsql/src/pl/plperl/plperl.c,v 1.67.4.7 2007/06/28 17:50:24 tgl Exp $
* *
**********************************************************************/ **********************************************************************/
@@ -385,7 +385,7 @@ plperl_build_tuple_result(HV *perlhash, AttInMetadata *attinmeta)
(errcode(ERRCODE_UNDEFINED_COLUMN), (errcode(ERRCODE_UNDEFINED_COLUMN),
errmsg("Perl hash contains nonexistent column \"%s\"", errmsg("Perl hash contains nonexistent column \"%s\"",
key))); key)));
if (SvOK(val) && SvTYPE(val) != SVt_NULL) if (SvOK(val))
values[attn - 1] = SvPV(val, PL_na); values[attn - 1] = SvPV(val, PL_na);
} }
hv_iterinit(perlhash); hv_iterinit(perlhash);
@@ -561,7 +561,7 @@ plperl_modify_tuple(HV *hvTD, TriggerData *tdata, HeapTuple otup)
(errcode(ERRCODE_UNDEFINED_COLUMN), (errcode(ERRCODE_UNDEFINED_COLUMN),
errmsg("Perl hash contains nonexistent column \"%s\"", errmsg("Perl hash contains nonexistent column \"%s\"",
key))); key)));
if (SvOK(val) && SvTYPE(val) != SVt_NULL) if (SvOK(val))
{ {
Oid typinput; Oid typinput;
Oid typioparam; Oid typioparam;
@@ -949,7 +949,7 @@ plperl_func_handler(PG_FUNCTION_ARGS)
if (SPI_finish() != SPI_OK_FINISH) if (SPI_finish() != SPI_OK_FINISH)
elog(ERROR, "SPI_finish() failed"); elog(ERROR, "SPI_finish() failed");
if (!(perlret && SvOK(perlret) && SvTYPE(perlret) != SVt_NULL)) if (!(perlret && SvOK(perlret)))
{ {
/* return NULL if Perl code returned undef */ /* return NULL if Perl code returned undef */
ReturnSetInfo *rsi = (ReturnSetInfo *) fcinfo->resultinfo; ReturnSetInfo *rsi = (ReturnSetInfo *) fcinfo->resultinfo;
@@ -1053,7 +1053,7 @@ plperl_func_handler(PG_FUNCTION_ARGS)
svp = av_fetch(ret_av, funcctx->call_cntr, FALSE); svp = av_fetch(ret_av, funcctx->call_cntr, FALSE);
Assert(svp != NULL); Assert(svp != NULL);
if (SvOK(*svp) && SvTYPE(*svp) != SVt_NULL) if (SvOK(*svp))
{ {
char *val = SvPV(*svp, PL_na); char *val = SvPV(*svp, PL_na);
@@ -1159,7 +1159,7 @@ plperl_trigger_handler(PG_FUNCTION_ARGS)
if (SPI_finish() != SPI_OK_FINISH) if (SPI_finish() != SPI_OK_FINISH)
elog(ERROR, "SPI_finish() failed"); elog(ERROR, "SPI_finish() failed");
if (!(perlret && SvOK(perlret) && SvTYPE(perlret) != SVt_NULL)) if (perlret == NULL || !SvOK(perlret))
{ {
/* undef result means go ahead with original tuple */ /* undef result means go ahead with original tuple */
TriggerData *trigdata = ((TriggerData *) fcinfo->context); TriggerData *trigdata = ((TriggerData *) fcinfo->context);