From 635c518748465cacf3c12ec280f24e8d6229582f Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Fri, 20 Nov 2026 15:40:29 +0100 Subject: [PATCH v2 7/7] WIP: More flex_size candidates These are the same issue as before, but the size is not constant, so the compiler won't flag it. (A static analyzer might?) --- src/backend/access/nbtree/nbtpage.c | 4 ++-- src/backend/access/nbtree/nbtree.c | 4 ++-- src/backend/access/nbtree/nbtxlog.c | 4 ++-- src/backend/statistics/dependencies.c | 6 ++---- src/backend/utils/adt/pg_dependencies.c | 2 +- src/backend/utils/adt/tsvector_op.c | 5 ++--- src/backend/utils/cache/typcache.c | 4 +--- src/fe_utils/simple_list.c | 3 +-- 8 files changed, 13 insertions(+), 19 deletions(-) diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c index 83d6d367f81..a8256092930 100644 --- a/src/backend/access/nbtree/nbtpage.c +++ b/src/backend/access/nbtree/nbtpage.c @@ -1648,8 +1648,8 @@ _bt_delitems_delete_check(Relation rel, Buffer buf, Relation heapRel, /* Exact match for deletable deltids entry -- ptid gets deleted */ if (vacposting == NULL) { - vacposting = palloc(offsetof(BTVacuumPostingData, deletetids) + - nitem * sizeof(uint16)); + vacposting = palloc_flex_array(BTVacuumPostingData, deletetids, + nitem); vacposting->itup = itup; vacposting->updatedoffset = idxoffnum; vacposting->ndeletedtids = 0; diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c index ef9ed290cae..2a5036aa3c1 100644 --- a/src/backend/access/nbtree/nbtree.c +++ b/src/backend/access/nbtree/nbtree.c @@ -1805,8 +1805,8 @@ btreevacuumposting(BTVacState *vstate, IndexTuple posting, * TIDs, so start maintaining metadata describing how to update * existing posting list tuple. */ - vacposting = palloc(offsetof(BTVacuumPostingData, deletetids) + - nitem * sizeof(uint16)); + vacposting = palloc_flex_array(BTVacuumPostingData, deletetids, + nitem); vacposting->itup = posting; vacposting->updatedoffset = updatedoffset; diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c index dff7d286fc8..0bb87e07a20 100644 --- a/src/backend/access/nbtree/nbtxlog.c +++ b/src/backend/access/nbtree/nbtxlog.c @@ -556,8 +556,8 @@ btree_xlog_updates(Page page, OffsetNumber *updatedoffsets, itemid = PageGetItemId(page, updatedoffsets[i]); origtuple = (IndexTuple) PageGetItem(page, itemid); - vacposting = palloc(offsetof(BTVacuumPostingData, deletetids) + - updates->ndeletedtids * sizeof(uint16)); + vacposting = palloc_flex_array(BTVacuumPostingData, deletetids, + updates->ndeletedtids); vacposting->updatedoffset = updatedoffsets[i]; vacposting->itup = origtuple; vacposting->ndeletedtids = updates->ndeletedtids; diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c index 612194193d9..7a7fc5cca00 100644 --- a/src/backend/statistics/dependencies.c +++ b/src/backend/statistics/dependencies.c @@ -391,8 +391,7 @@ statext_dependencies_build(StatsBuildData *data) if (degree == 0.0) continue; - d = (MVDependency *) palloc0(offsetof(MVDependency, attributes) - + k * sizeof(AttrNumber)); + d = palloc0_flex_array(MVDependency, attributes, k); /* copy the dependency (and keep the indexes into stxkeys) */ d->degree = degree; @@ -556,8 +555,7 @@ statext_dependencies_deserialize(bytea *data) Assert((k >= 2) && (k <= STATS_MAX_DIMENSIONS)); /* now that we know the number of attributes, allocate the dependency */ - d = (MVDependency *) palloc0(offsetof(MVDependency, attributes) - + (k * sizeof(AttrNumber))); + d = palloc0_flex_array(MVDependency, attributes, k); d->degree = degree; d->nattributes = k; diff --git a/src/backend/utils/adt/pg_dependencies.c b/src/backend/utils/adt/pg_dependencies.c index 1b88c1dfc29..ab3861f59cd 100644 --- a/src/backend/utils/adt/pg_dependencies.c +++ b/src/backend/utils/adt/pg_dependencies.c @@ -202,7 +202,7 @@ dependencies_object_end(void *state) * Allocate enough space for the dependency, the attribute numbers in the * list and the final attribute number for the dependency. */ - dep = palloc0(offsetof(MVDependency, attributes) + ((natts + 1) * sizeof(AttrNumber))); + dep = palloc0_flex_array(MVDependency, attributes, natts + 1); dep->nattributes = natts + 1; dep->attributes[natts] = parse->dependency; diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c index bcb434c83e7..eaaa85759be 100644 --- a/src/backend/utils/adt/tsvector_op.c +++ b/src/backend/utils/adt/tsvector_op.c @@ -53,8 +53,6 @@ typedef struct StatEntry pg_attribute_counted_by(lenlexeme) char lexeme[FLEXIBLE_ARRAY_MEMBER]; } StatEntry; -#define STATENTRYHDRSZ (offsetof(StatEntry, lexeme)) - typedef struct { int32 weight; @@ -2372,7 +2370,8 @@ insertStatEntry(MemoryContext persistentContext, TSVectorStat *stat, TSVector tx if (node == NULL) { - node = MemoryContextAlloc(persistentContext, STATENTRYHDRSZ + we->len); + node = MemoryContextAlloc(persistentContext, + flex_size(StatEntry, lexeme, we->len)); node->left = node->right = NULL; node->ndoc = 1; node->nentry = n; diff --git a/src/backend/utils/cache/typcache.c b/src/backend/utils/cache/typcache.c index f969b435cb7..7f1369a2276 100644 --- a/src/backend/utils/cache/typcache.c +++ b/src/backend/utils/cache/typcache.c @@ -2874,9 +2874,7 @@ load_enum_cache_data(TypeCacheEntry *tcache) /* OK, copy the data into CacheMemoryContext */ oldcxt = MemoryContextSwitchTo(CacheMemoryContext); - enumdata = (TypeCacheEnumData *) - palloc(offsetof(TypeCacheEnumData, enum_values) + - numitems * sizeof(EnumItem)); + enumdata = palloc_flex_array(TypeCacheEnumData, enum_values, numitems); enumdata->bitmap_base = bitmap_base; enumdata->sorted_values = bms_copy(bitmap); enumdata->num_values = numitems; diff --git a/src/fe_utils/simple_list.c b/src/fe_utils/simple_list.c index 03c11bae7c8..8db4eb0d839 100644 --- a/src/fe_utils/simple_list.c +++ b/src/fe_utils/simple_list.c @@ -64,8 +64,7 @@ simple_string_list_append(SimpleStringList *list, const char *val) { SimpleStringListCell *cell; - cell = (SimpleStringListCell *) - pg_malloc(offsetof(SimpleStringListCell, val) + strlen(val) + 1); + cell = pg_malloc_flex_array(SimpleStringListCell, val, strlen(val) + 1); cell->next = NULL; cell->touched = false; -- 2.56.0