Skip to content

Commit 52ad5fc

Browse files
committed
Don't access catalogs to validate GUCs when not connected to a DB.
Vignesh found this bug in the check function for default_table_access_method's check hook, but that was just copied from older GUCs. Investigation by Michael and me then found the bug in further places. When not connected to a database (e.g. in a walsender connection), we cannot perform (most) GUC checks that need database access. Even when only shared tables are needed, unless they're nailed (c.f. RelationCacheInitializePhase2()), they cannot be accessed without pg_class etc. being present. Fix by extending the existing IsTransactionState() checks to also check for MyDatabaseOid. Reported-By: Vignesh C, Michael Paquier, Andres Freund Author: Vignesh C, Andres Freund Discussion: https://postgr.es/m/CALDaNm1KXK9gbZfY-p_peRFm_XrBh1OwQO1Kk6Gig0c0fVZ2uw%40mail.gmail.com Backpatch: 9.4-
1 parent 1eb8a5e commit 52ad5fc

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

src/backend/commands/tablespace.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1062,10 +1062,11 @@ bool
10621062
check_default_tablespace(char **newval, void **extra, GucSource source)
10631063
{
10641064
/*
1065-
* If we aren't inside a transaction, we cannot do database access so
1066-
* cannot verify the name. Must accept the value on faith.
1065+
* If we aren't inside a transaction, or connected to a database, we
1066+
* cannot do the catalog accesses necessary to verify the name. Must
1067+
* accept the value on faith.
10671068
*/
1068-
if (IsTransactionState())
1069+
if (IsTransactionState() && MyDatabaseId != InvalidOid)
10691070
{
10701071
if (**newval != '\0' &&
10711072
!OidIsValid(get_tablespace_oid(*newval, true)))
@@ -1173,11 +1174,12 @@ check_temp_tablespaces(char **newval, void **extra, GucSource source)
11731174
}
11741175

11751176
/*
1176-
* If we aren't inside a transaction, we cannot do database access so
1177-
* cannot verify the individual names. Must accept the list on faith.
1177+
* If we aren't inside a transaction, or connected to a database, we
1178+
* cannot do the catalog accesses necessary to verify the name. Must
1179+
* accept the value on faith.
11781180
* Fortunately, there's then also no need to pass the data to fd.c.
11791181
*/
1180-
if (IsTransactionState())
1182+
if (IsTransactionState() && MyDatabaseId != InvalidOid)
11811183
{
11821184
temp_tablespaces_extra *myextra;
11831185
Oid *tblSpcs;

src/backend/utils/cache/ts_cache.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include "catalog/pg_ts_parser.h"
3939
#include "catalog/pg_ts_template.h"
4040
#include "commands/defrem.h"
41+
#include "miscadmin.h"
4142
#include "tsearch/ts_cache.h"
4243
#include "utils/builtins.h"
4344
#include "utils/catcache.h"
@@ -587,10 +588,11 @@ bool
587588
check_TSCurrentConfig(char **newval, void **extra, GucSource source)
588589
{
589590
/*
590-
* If we aren't inside a transaction, we cannot do database access so
591-
* cannot verify the config name. Must accept it on faith.
591+
* If we aren't inside a transaction, or connected to a database, we
592+
* cannot do the catalog accesses necessary to verify the config name.
593+
* Must accept it on faith.
592594
*/
593-
if (IsTransactionState())
595+
if (IsTransactionState() && MyDatabaseId != InvalidOid)
594596
{
595597
Oid cfgId;
596598
HeapTuple tuple;

0 commit comments

Comments
 (0)