Commit68c903a

committed

Properly handle empty arrays returned from plperl functions.

Bug reported by David Wheeler, fix by Alex Hunsaker.

1 parent1bf8004 commit68c903aCopy full SHA for 68c903a

File tree

-3

lines changed

-3

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1078,14 +1078,15 @@ _array_to_datum(AV av, int ndims, int *dims, int cur_depth,`
`1078`	`1078`	`inti=0;`
`1079`	`1079`	`intlen=av_len(av)+1;`
`1080`	`1080`
`1081`		`-if (len==0)`
`1082`		`-astate=accumArrayResult(astate, (Datum)0, true,atypid,NULL);`
`1083`		`-`
`1084`	`1081`	`for (i=0;i<len;i++)`
`1085`	`1082`	`{`
	`1083`	`+/* fetch the array element */`
`1086`	`1084`	`SV**svp=av_fetch(av,i, FALSE);`
	`1085`	`+`
	`1086`	`+/* see if this element is an array, if so get that */`
`1087`	`1087`	`SVsav=svp ?get_perl_array_ref(svp) :NULL;`
`1088`	`1088`
	`1089`	`+/* multi-dimensional array? */`
`1089`	`1090`	`if (sav)`
`1090`	`1091`	`{`
`1091`	`1092`	`AVnav= (AV)SvRV(sav);`
`@@ -1149,6 +1150,9 @@ plperl_array_to_datum(SV *src, Oid typid)`
`1149`	`1150`	`astate=_array_to_datum((AV*)SvRV(src),&ndims,dims,1,astate,typid,`
`1150`	`1151`	`atypid);`
`1151`	`1152`
	`1153`	`+if (!astate)`
	`1154`	`+returnPointerGetDatum(construct_empty_array(atypid));`
	`1155`	`+`
`1152`	`1156`	`for (i=0;i<ndims;i++)`
`1153`	`1157`	`lbs[i]=1;`
`1154`	`1158`

Comments

(0)