git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/contrib/intagg/int_aggregate.c b/contrib/intagg/int_aggregate.c

index 292855018acc1d0a828960387d3fdaef0769d945..df2bd1e0336872f0d63a5ab436308f2b39087acf 100644 (file)

--- a/contrib/intagg/int_aggregate.c

+++ b/contrib/intagg/int_aggregate.c

pc->flags = 0;

}

/* Now that we have a detoasted array, verify dimensions */

- if (pc->p->a.ndim != 1)

+ /* We'll treat a zero-D array as empty, below */

+ if (pc->p->a.ndim > 1)

elog(ERROR, "int_enum only accepts 1-D arrays");

pc->num = 0;

fcinfo->context = (Node *) pc;

else /* use an existing one */

pc = (CTX *) fcinfo->context;

/* Are we done yet? */

- if (pc->num >= pc->p->items)

+ if (pc->p->a.ndim < 1 || pc->num >= pc->p->items)

{

/* We are done */

if (pc->flags & TOASTED)