diff options
| author | Noah Misch <noah@leadboat.com> | 2015-01-07 22:33:58 -0500 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2015-01-07 22:33:58 -0500 |
| commit | e415b469b33ba328765e39fd62edcd28f30d9c3c (patch) | |
| tree | 836c785c7790fd0716092a2844b821f34071b938 /src/backend/commands/vacuum.c | |
| parent | 39f2594ba54657f3fa8d0fe230447e673bcba2a4 (diff) | |
| download | postgresql-e415b469b33ba328765e39fd62edcd28f30d9c3c.tar.gz postgresql-e415b469b33ba328765e39fd62edcd28f30d9c3c.zip | |
Reject ANALYZE commands during VACUUM FULL or another ANALYZE.
vacuum()'s static variable handling makes it non-reentrant; an ensuing
null pointer deference crashed the backend. Back-patch to 9.0 (all
supported versions).
Diffstat (limited to 'src/backend/commands/vacuum.c')
| -rw-r--r-- | src/backend/commands/vacuum.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c index a787e8071fe..2f3f79d87d3 100644 --- a/src/backend/commands/vacuum.c +++ b/src/backend/commands/vacuum.c @@ -105,6 +105,7 @@ vacuum(VacuumStmt *vacstmt, Oid relid, bool do_toast, volatile bool in_outer_xact, use_own_xacts; List *relations; + static bool in_vacuum = false; /* sanity checks on options */ Assert(vacstmt->options & (VACOPT_VACUUM | VACOPT_ANALYZE)); @@ -131,6 +132,14 @@ vacuum(VacuumStmt *vacstmt, Oid relid, bool do_toast, in_outer_xact = IsInTransactionChain(isTopLevel); /* + * Due to static variables vac_context, anl_context and vac_strategy, + * vacuum() is not reentrant. This matters when VACUUM FULL or ANALYZE + * calls a hostile index expression that itself calls ANALYZE. + */ + if (in_vacuum) + elog(ERROR, "%s cannot be executed from VACUUM or ANALYZE", stmttype); + + /* * Send info about dead objects to the statistics collector, unless we are * in autovacuum --- autovacuum.c does this for itself. */ @@ -222,6 +231,7 @@ vacuum(VacuumStmt *vacstmt, Oid relid, bool do_toast, { ListCell *cur; + in_vacuum = true; VacuumCostActive = (VacuumCostDelay > 0); VacuumCostBalance = 0; VacuumPageHit = 0; @@ -266,13 +276,13 @@ vacuum(VacuumStmt *vacstmt, Oid relid, bool do_toast, } PG_CATCH(); { - /* Make sure cost accounting is turned off after error */ + in_vacuum = false; VacuumCostActive = false; PG_RE_THROW(); } PG_END_TRY(); - /* Turn off vacuum cost accounting */ + in_vacuum = false; VacuumCostActive = false; /* |