From d6894d6a08f80b3b0608402f5e2d069201503b48 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Fri, 14 Feb 2025 11:50:56 +0100 Subject: [PATCH] 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 Reviewed-by: Daniel Gustafsson Reviewed-by: Michael Paquier Discussion: https://postgr.es/m/1618848d-cdc7-414b-9c03-08cf4bef4408@postgrespro.ru Backpatch-through: 13 --- src/backend/executor/execMain.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 527e914ce96..8048b810e51 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -2629,13 +2629,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");