From 28026681598526cea3bc50da93a4ab37a161be19 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Mon, 2 Dec 2002 05:20:47 +0000
Subject: Repair core dump when trying to delete an entry from an already-NULL
 datconfig or useconfig field.  Per report from Dustin Sallings.

---
 src/backend/commands/dbcommands.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/backend/commands/dbcommands.c')

diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 291770f98cc..f2973d6b165 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.107 2002/11/02 18:41:21 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.108 2002/12/02 05:20:47 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -561,7 +561,10 @@ AlterDatabaseSet(AlterDatabaseSetStmt *stmt)
 		else
 			a = GUCArrayDelete(a, stmt->variable);
 
-		repl_val[Anum_pg_database_datconfig - 1] = PointerGetDatum(a);
+		if (a)
+			repl_val[Anum_pg_database_datconfig - 1] = PointerGetDatum(a);
+		else
+			repl_null[Anum_pg_database_datconfig - 1] = 'n';
 	}
 
 	newtuple = heap_modifytuple(tuple, rel, repl_val, repl_null, repl_repl);
-- 
cgit v1.2.3