From a82ee7ef3aacc2073d3ef5f4b7e5067fa08ea76c Mon Sep 17 00:00:00 2001 From: Tomas Vondra Date: Mon, 27 Nov 2023 16:52:59 +0100 Subject: Check if ii_AmCache is NULL in aminsertcleanup Fix a bug introduced by c1ec02be1d79. It may happen that the executor opens indexes on the result relation, but no rows end up being inserted. Then the index_insert_cleanup still gets executed, but passes down NULL to the AM callback. The AM callback may not expect this, as is the case of brininsertcleanup, leading to a crash. Fixed by only calling the cleanup callback if (ii_AmCache != NULL). This way the AM can simply assume to only see a valid cache. Reported-by: Richard Guo Discussion: https://postgr.es/m/CAMbWs4-w9qC-o9hQox9UHvdVZAYTp8OrPQOKtwbvzWaRejTT=Q@mail.gmail.com --- src/backend/access/index/indexam.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/backend/access/index/indexam.c') diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c index 597b763d1f6..f23e0199f08 100644 --- a/src/backend/access/index/indexam.c +++ b/src/backend/access/index/indexam.c @@ -207,7 +207,7 @@ index_insert_cleanup(Relation indexRelation, RELATION_CHECKS; Assert(indexInfo); - if (indexRelation->rd_indam->aminsertcleanup) + if (indexRelation->rd_indam->aminsertcleanup && indexInfo->ii_AmCache) indexRelation->rd_indam->aminsertcleanup(indexInfo); } -- cgit v1.2.3