From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 23 Apr 2005 17:55:50 +0000 (+0000)
Subject: Treat a zero-D array as empty in int_enum(), per Andrew@supernews.
X-Git-Tag: REL8_1_0BETA1~955
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d79eeef38b075025c68ddf7debba4224b6aeabc8;p=thirdparty%2Fpostgresql.git

Treat a zero-D array as empty in int_enum(), per Andrew@supernews.
---

diff --git a/contrib/intagg/int_aggregate.c b/contrib/intagg/int_aggregate.c
index 292855018ac..df2bd1e0336 100644
--- a/contrib/intagg/int_aggregate.c
+++ b/contrib/intagg/int_aggregate.c
@@ -243,7 +243,8 @@ int_enum(PG_FUNCTION_ARGS)
 			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;
@@ -252,7 +253,7 @@ int_enum(PG_FUNCTION_ARGS)
 	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)