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

diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 06bf80d0afcbf0555af249671ed2edf9e27faa07..e09705b9a07561f486c2e72e0badb083b76e49f2 100644 (file)
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -2653,13 +2653,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");