diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-12-02 05:21:02 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-12-02 05:21:02 +0000 |
| commit | 4390ebc505e89efb98cfeac9847dd7a314bf5b11 (patch) | |
| tree | 1e836435e12325bd0feba5502979d008b3f3bd10 /src/backend/commands/dbcommands.c | |
| parent | 22499b485429b38db3f521dfccde6c2c4accaa6c (diff) | |
| download | postgresql-4390ebc505e89efb98cfeac9847dd7a314bf5b11.tar.gz postgresql-4390ebc505e89efb98cfeac9847dd7a314bf5b11.zip | |
Repair core dump when trying to delete an entry from an already-NULL
datconfig or useconfig field. Per report from Dustin Sallings.
Diffstat (limited to 'src/backend/commands/dbcommands.c')
| -rw-r--r-- | src/backend/commands/dbcommands.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 291770f98cc..79fd2fe97f0 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.107.2.1 2002/12/02 05:21:01 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); |