database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-29 10:41:53 +03:00
Code Activity

Fix unnest() to handle a toasted input array safely. Per report from

Browse Source 
Alvaro.
This commit is contained in:
Tom Lane
2009-01-30 21:21:18 +00:00
parent 4265ed9f4e
commit daac6e988e
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/backend/utils/adt/arrayfuncs.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.152 2009/01/01 17:23:49 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.153 2009/01/30 21:21:18 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -4665,7 +4665,7 @@ array_unnest(PG_FUNCTION_ARGS)
/* stuff done only on the first call of the function */ /* stuff done only on the first call of the function */
if (SRF_IS_FIRSTCALL()) if (SRF_IS_FIRSTCALL())
{ {
ArrayType *arr = PG_GETARG_ARRAYTYPE_P(0); ArrayType *arr;
/* create a function context for cross-call persistence */ /* create a function context for cross-call persistence */
funcctx = SRF_FIRSTCALL_INIT(); funcctx = SRF_FIRSTCALL_INIT();
@ -4675,13 +4675,19 @@ array_unnest(PG_FUNCTION_ARGS)
*/ */
oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx); oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
/*
* Get the array value and detoast if needed. We can't do this
* earlier because if we have to detoast, we want the detoasted
* copy to be in multi_call_memory_ctx, so it will go away when
* we're done and not before. (If no detoast happens, we assume
* the originally passed array will stick around till then.)
*/
arr = PG_GETARG_ARRAYTYPE_P(0);
/* allocate memory for user context */ /* allocate memory for user context */
fctx = (array_unnest_fctx *) palloc(sizeof(array_unnest_fctx)); fctx = (array_unnest_fctx *) palloc(sizeof(array_unnest_fctx));
/* /* initialize state */
* Initialize state. Note we assume that the originally passed
* array will stick around for the whole call series.
*/
fctx->arr = arr; fctx->arr = arr;
fctx->nextelem = 0; fctx->nextelem = 0;
fctx->numelems = ArrayGetNItems(ARR_NDIM(arr), ARR_DIMS(arr)); fctx->numelems = ArrayGetNItems(ARR_NDIM(arr), ARR_DIMS(arr));