diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/jsonbsubs.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/backend/utils/adt/jsonbsubs.c b/src/backend/utils/adt/jsonbsubs.c index 491e27cc04b..cfb923aaa35 100644 --- a/src/backend/utils/adt/jsonbsubs.c +++ b/src/backend/utils/adt/jsonbsubs.c @@ -356,7 +356,7 @@ jsonb_subscript_fetch_old(ExprState *state, static void jsonb_exec_setup(const SubscriptingRef *sbsref, SubscriptingRefState *sbsrefstate, - SubscriptExecSteps * methods) + SubscriptExecSteps *methods) { JsonbSubWorkspace *workspace; ListCell *lc; @@ -368,9 +368,14 @@ jsonb_exec_setup(const SubscriptingRef *sbsref, nupper * (sizeof(Datum) + sizeof(Oid))); workspace->expectArray = false; ptr = ((char *) workspace) + MAXALIGN(sizeof(JsonbSubWorkspace)); - workspace->indexOid = (Oid *) ptr; - ptr += nupper * sizeof(Oid); + + /* + * This coding assumes sizeof(Datum) >= sizeof(Oid), else we might + * misalign the indexOid pointer + */ workspace->index = (Datum *) ptr; + ptr += nupper * sizeof(Datum); + workspace->indexOid = (Oid *) ptr; sbsrefstate->workspace = workspace; |