diff options
| author | Bruce Momjian | 2013-12-03 16:11:56 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2013-12-03 16:12:25 +0000 |
| commit | 9e0a97f1c8316e36fa4a8626e0a60792b0fb0c2e (patch) | |
| tree | 659c15fa695ca0fc7ccbedde530ea54ead06e2f2 /contrib | |
| parent | 95e3d50539afcdcd4b75b4ac5baa9f8fc05324d9 (diff) | |
libpq: change PQconndefaults() to ignore invalid service files
Previously missing or invalid service files returned NULL. Also fix
pg_upgrade to report "out of memory" for a null return from
PQconndefaults().
Patch by Steve Singer, rewritten by me
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/pg_upgrade/server.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c index b75f5530ed..7d2aa352c8 100644 --- a/contrib/pg_upgrade/server.c +++ b/contrib/pg_upgrade/server.c @@ -325,6 +325,9 @@ check_pghost_envvar(void) start = PQconndefaults(); + if (!start) + pg_fatal("out of memory\n"); + for (option = start; option->keyword != NULL; option++) { if (option->envvar && (strcmp(option->envvar, "PGHOST") == 0 || |