aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2021-11-02 13:36:47 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2021-11-02 13:36:57 -0400
commitada667b45496998674818e135e9cd6580f1bc019 (patch)
tree3b5a8bd416adc0672a3e2a65fcbb6efc759a66c9
parent0151af40cd4e0321bc549cea9f0c631bce0303c5 (diff)
downloadpostgresql-ada667b45496998674818e135e9cd6580f1bc019.tar.gz
postgresql-ada667b45496998674818e135e9cd6580f1bc019.zip
Fix variable lifespan in ExecInitCoerceToDomain().
This undoes a mistake in 1ec7679f1: domainval and domainnull were meant to live across loop iterations, but they were incorrectly moved inside the loop. The effect was only to emit useless extra EEOP_MAKE_READONLY steps, so it's not a big deal; nonetheless, back-patch to v13 where the mistake was introduced. Ranier Vilela Discussion: https://postgr.es/m/CAEudQAqXuhbkaAp-sGH6dR6Nsq7v28_0TPexHOm6FiDYqwQD-w@mail.gmail.com
-rw-r--r--src/backend/executor/execExpr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/backend/executor/execExpr.c b/src/backend/executor/execExpr.c
index 209318680e3..9653652f6dd 100644
--- a/src/backend/executor/execExpr.c
+++ b/src/backend/executor/execExpr.c
@@ -2828,6 +2828,8 @@ ExecInitCoerceToDomain(ExprEvalStep *scratch, CoerceToDomain *ctest,
ExprState *state, Datum *resv, bool *resnull)
{
DomainConstraintRef *constraint_ref;
+ Datum *domainval = NULL;
+ bool *domainnull = NULL;
ListCell *l;
scratch->d.domaincheck.resulttype = ctest->resulttype;
@@ -2874,8 +2876,6 @@ ExecInitCoerceToDomain(ExprEvalStep *scratch, CoerceToDomain *ctest,
foreach(l, constraint_ref->constraints)
{
DomainConstraintState *con = (DomainConstraintState *) lfirst(l);
- Datum *domainval = NULL;
- bool *domainnull = NULL;
Datum *save_innermost_domainval;
bool *save_innermost_domainnull;