diff options
| author | Daniel Gustafsson <dgustafsson@postgresql.org> | 2025-02-14 11:50:56 +0100 |
|---|---|---|
| committer | Daniel Gustafsson <dgustafsson@postgresql.org> | 2025-02-14 11:50:56 +0100 |
| commit | 67a02341572e0dcf27a290953317a39c7f15cc82 (patch) | |
| tree | 449b2f5bee8760e60527b11afcf7a8eca8e0aa7b | |
| parent | 9e17ac997f921c9de99125a97a0f34ae50f5c498 (diff) | |
| download | postgresql-67a02341572e0dcf27a290953317a39c7f15cc82.tar.gz postgresql-67a02341572e0dcf27a290953317a39c7f15cc82.zip | |
Fix assertion on dereferenced object
Commit 27cc7cd2bc8a accidentally placed the assertion ensuring
that the pointer isn't NULL after it had already been accessed.
Fix by moving the pointer dereferencing to after the assertion.
Backpatch to all supported branches.
Author: Dmitry Koval <d.koval@postgrespro.ru>
Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
Reviewed-by: Michael Paquier <michael@paquier.xyz>
Discussion: https://postgr.es/m/1618848d-cdc7-414b-9c03-08cf4bef4408@postgrespro.ru
Backpatch-through: 13
| -rw-r--r-- | src/backend/executor/execMain.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 39d80ccfbad..963aa390620 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -2662,13 +2662,15 @@ bool EvalPlanQualFetchRowMark(EPQState *epqstate, Index rti, TupleTableSlot *slot) { ExecAuxRowMark *earm = epqstate->relsubs_rowmark[rti - 1]; - ExecRowMark *erm = earm->rowmark; + ExecRowMark *erm; Datum datum; bool isNull; Assert(earm != NULL); Assert(epqstate->origslot != NULL); + erm = earm->rowmark; + if (RowMarkRequiresRowShareLock(erm->markType)) elog(ERROR, "EvalPlanQual doesn't support locking rowmarks"); |