aboutsummaryrefslogtreecommitdiff
path: root/src/backend/executor/nodeModifyTable.c
diff options
context:
space:
mode:
authorDavid Rowley <drowley@postgresql.org>2020-04-18 14:11:21 +1200
committerDavid Rowley <drowley@postgresql.org>2020-04-18 14:11:21 +1200
commita375f11c44cf245363f356508f7d5126bdaa18ae (patch)
tree190011eb48ecbe7bb1c71ed97d85d98f3df64c83 /src/backend/executor/nodeModifyTable.c
parent6b02bee66cae232d587679eb476f4784c38abad1 (diff)
downloadpostgresql-a375f11c44cf245363f356508f7d5126bdaa18ae.tar.gz
postgresql-a375f11c44cf245363f356508f7d5126bdaa18ae.zip
Fix possible crash with GENERATED ALWAYS columns
In some corner cases, this could also lead to corrupted values being included in the tuple. Users who are concerned that they are affected by this should first upgrade and then perform a base backup of their database and restore onto an off-line server. They should then query each table with generated columns to ensure there are no rows where the generated expression does not match a newly calculated version of the GENERATED ALWAYS expression. If no crashes occur and no rows are returned then you're not affected. Fixes bug #16369. Reported-by: Cameron Ezell Discussion: https://postgr.es/m/16369-5845a6f1bef59884@postgresql.org Backpatch-through: 12 (where GENERATED ALWAYS columns were added.)
Diffstat (limited to 'src/backend/executor/nodeModifyTable.c')
-rw-r--r--src/backend/executor/nodeModifyTable.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
index 212b12ab514..08609f23dd1 100644
--- a/src/backend/executor/nodeModifyTable.c
+++ b/src/backend/executor/nodeModifyTable.c
@@ -311,6 +311,13 @@ ExecComputeStoredGenerated(EState *estate, TupleTableSlot *slot)
val = ExecEvalExpr(resultRelInfo->ri_GeneratedExprs[i], econtext, &isnull);
+ /*
+ * We must make a copy of val as we have no guarantees about where
+ * memory for a pass-by-reference Datum is located.
+ */
+ if (!isnull)
+ val = datumCopy(val, attr->attbyval, attr->attlen);
+
values[i] = val;
nulls[i] = isnull;
}