database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-08 22:02:03 +03:00
Code

Fix aclexplode to not explode on a zero-entry ACL array.

Browse Source 
(An Assert is no substitute for thinking clearly :-()

Minor style kibitzing too.

Per report from Robert Treat.
This commit is contained in:
Tom Lane 2010-01-12 02:39:22 +00:00
parent 6ce4e4f39b
commit 894fc6b763
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/backend/utils/adt/acl.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/acl.c,v 1.154 2010/01/02 16:57:53 momjian Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/acl.c,v 1.155 2010/01/12 02:39:22 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -1680,9 +1680,9 @@ convert_aclright_to_string(int aclright)
Datum Datum
aclexplode(PG_FUNCTION_ARGS) aclexplode(PG_FUNCTION_ARGS)
{ {
Acl *acl = PG_GETARG_ACL_P(0);
FuncCallContext *funcctx; FuncCallContext *funcctx;
int *idx; int *idx;
Acl *acl = PG_GETARG_ACL_P(0);
AclItem *aidat; AclItem *aidat;
if (SRF_IS_FIRSTCALL()) if (SRF_IS_FIRSTCALL())
@ -1722,34 +1722,36 @@ aclexplode(PG_FUNCTION_ARGS)
funcctx = SRF_PERCALL_SETUP(); funcctx = SRF_PERCALL_SETUP();
idx = (int *) funcctx->user_fctx; idx = (int *) funcctx->user_fctx;
aidat = ACL_DAT(acl); aidat = ACL_DAT(acl);
while (1)
/* need test here in case acl has no items */
while (idx[0] < ACL_NUM(acl))
{ {
AclItem *aidata;
AclMode priv_bit;
idx[1]++; idx[1]++;
if (idx[1] == N_ACL_RIGHTS) if (idx[1] == N_ACL_RIGHTS)
{ {
idx[1] = 0; idx[1] = 0;
idx[0]++; idx[0]++;
if (idx[0] == ACL_NUM(acl)) if (idx[0] >= ACL_NUM(acl)) /* done */
/* done */
break; break;
} }
aidata = &aidat[idx[0]];
priv_bit = 1 << idx[1];
Assert(idx[0] < ACL_NUM(acl)); if (ACLITEM_GET_PRIVS(*aidata) & priv_bit)
Assert(idx[1] < N_ACL_RIGHTS);
if (ACLITEM_GET_PRIVS(aidat[idx[0]]) & (1 << idx[1]))
{ {
Datum result; Datum result;
Datum values[4]; Datum values[4];
bool nulls[4]; bool nulls[4];
HeapTuple tuple; HeapTuple tuple;
values[0] = ObjectIdGetDatum(aidat[idx[0]].ai_grantor); values[0] = ObjectIdGetDatum(aidata->ai_grantor);
values[1] = ObjectIdGetDatum(aidat[idx[0]].ai_grantee); values[1] = ObjectIdGetDatum(aidata->ai_grantee);
values[2] = CStringGetTextDatum(convert_aclright_to_string(1 << idx[1])); values[2] = CStringGetTextDatum(convert_aclright_to_string(priv_bit));
values[3] = BoolGetDatum(ACLITEM_GET_GOPTIONS(aidat[idx[0]]) & (1 << idx[1])); values[3] = BoolGetDatum((ACLITEM_GET_GOPTIONS(*aidata) & priv_bit) != 0);
MemSet(nulls, 0, sizeof(nulls)); MemSet(nulls, 0, sizeof(nulls));