merge-uninit.patch

text/x-diff

Filename: merge-uninit.patch

Type: text/x-diff

Part: 0

Message: Re: BUG #17792: MERGE uses uninitialized pointer and crashes when target tuple is updated concurrently

Patch

Format: unified

File	+	−
src/backend/executor/nodeModifyTable.c	3	0

diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
index 1ac65172e4..2a0e002dc9 100644
--- a/src/backend/executor/nodeModifyTable.c
+++ b/src/backend/executor/nodeModifyTable.c
@@ -3630,6 +3630,9 @@ ExecModifyTable(PlanState *pstate)
 		 */
 		ResetPerTupleExprContext(estate);
 
+		/* Decisions are made based on whether this is NULL for each tuple */
+		context.cpUpdateRetrySlot = NULL;
+
 		/*
 		 * Reset per-tuple memory context used for processing on conflict and
 		 * returning clauses, to free any expression evaluation storage