From 026134f8a096a22a416d857ea56392375cb1ac3e Mon Sep 17 00:00:00 2001 From: Aleksander Alekseev Date: Mon, 24 Jul 2023 18:17:58 +0300 Subject: [PATCH v2] Check more invariants during syscache initialization Prior to this commit InitCatalogCache() had only one Assert for cacheinfo[] that checks .reloid. Add sanity checks for other fields. Aleksander Alekseev, reviewed by Michael Paquier Discussion: https://postgr.es/m/CAJ7c6TOjUTJ0jxvWY6oJeP2-840OF8ch7qscZQsuVuotXTOS_g@mail.gmail.com --- src/backend/utils/cache/catcache.c | 3 +++ src/backend/utils/cache/syscache.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index 4510031fe6..ef1aff62c9 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -825,7 +825,10 @@ InitCatCache(int id, cp->cc_nbuckets = nbuckets; cp->cc_nkeys = nkeys; for (i = 0; i < nkeys; ++i) + { + Assert(key[i] != InvalidAttrNumber); cp->cc_keyno[i] = key[i]; + } /* * new cache is initialized as far as we can go for now. print some diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c index 4e4a34bde8..d5a53a7911 100644 --- a/src/backend/utils/cache/syscache.c +++ b/src/backend/utils/cache/syscache.c @@ -720,7 +720,9 @@ InitCatalogCache(void) * Assert that every enumeration value defined in syscache.h has been * populated in the cacheinfo array. */ - Assert(cacheinfo[cacheId].reloid != 0); + Assert(cacheinfo[cacheId].reloid != InvalidOid); + Assert(cacheinfo[cacheId].indoid != InvalidOid); + /* .nbuckets and .key[] are checked by InitCatCache() */ SysCache[cacheId] = InitCatCache(cacheId, cacheinfo[cacheId].reloid, -- 2.41.0