From 543e5ab8be9d10fe3bf28effa2bd929f827d8793 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 22 Mar 2012 14:13:17 -0400
Subject: [PATCH] Fix GET DIAGNOSTICS for case of assignment to function's
first variable.
An incorrect and entirely unnecessary "safety check" in exec_stmt_getdiag()
caused the code to treat an assignment to a variable with dno zero as a
no-op. Unfortunately, that's a perfectly valid dno. This has been broken
since GET DIAGNOSTICS was invented. It's not terribly surprising that the
bug went unnoticed for so long, since in most cases you probably wouldn't
use the function's first-created variable (normally its first parameter)
as a GET DIAGNOSTICS target. Nonetheless, it's broken. Per bug #6551
from Adam Buraczewski.
---
src/pl/plpgsql/src/pl_exec.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index f01a0f9979..32f57a3256 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -1401,17 +1401,9 @@ exec_stmt_getdiag(PLpgSQL_execstate *estate, PLpgSQL_stmt_getdiag *stmt)
foreach(lc, stmt->diag_items)
{
PLpgSQL_diag_item *diag_item = (PLpgSQL_diag_item *) lfirst(lc);
- PLpgSQL_datum *var;
+ PLpgSQL_datum *var = estate->datums[diag_item->target];
bool isnull = false;
- if (diag_item->target <= 0)
- continue;
-
- var = estate->datums[diag_item->target];
-
- if (var == NULL)
- continue;
-
switch (diag_item->kind)
{
case PLPGSQL_GETDIAG_ROW_COUNT: