From 9e0a97f1c8316e36fa4a8626e0a60792b0fb0c2e Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 3 Dec 2013 11:11:56 -0500
Subject: [PATCH] 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
---
contrib/pg_upgrade/server.c | 3 +++
doc/src/sgml/libpq.sgml | 3 ++-
src/interfaces/libpq/fe-auth.c | 2 +-
src/interfaces/libpq/fe-auth.h | 2 +-
src/interfaces/libpq/fe-connect.c | 27 ++++++++++++++++-----------
5 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/contrib/pg_upgrade/server.c b/contrib/pg_upgrade/server.c
index b75f5530edf..7d2aa352c80 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 ||
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index 955f248b13a..503a63a58bd 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -483,7 +483,8 @@ typedef struct
with an entry having a null <structfield>keyword</> pointer. The
null pointer is returned if memory could not be allocated. Note that
the current default values (<structfield>val</structfield> fields)
- will depend on environment variables and other context. Callers
+ will depend on environment variables and other context. A
+ missing or invalid service file will be silently ignored. Callers
must treat the connection options data as read-only.
</para>
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index 975f7958d11..979714055e3 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -982,7 +982,7 @@ pg_fe_sendauth(AuthRequest areq, PGconn *conn)
* if there is an error, return NULL with an error message in errorMessage
*/
char *
-pg_fe_getauthname(PQExpBuffer errorMessage)
+pg_fe_getauthname(void)
{
const char *name = NULL;
char *authn;
diff --git a/src/interfaces/libpq/fe-auth.h b/src/interfaces/libpq/fe-auth.h
index bfddc682b1f..25440b06bd9 100644
--- a/src/interfaces/libpq/fe-auth.h
+++ b/src/interfaces/libpq/fe-auth.h
@@ -19,6 +19,6 @@
extern int pg_fe_sendauth(AuthRequest areq, PGconn *conn);
-extern char *pg_fe_getauthname(PQExpBuffer errorMessage);
+extern char *pg_fe_getauthname(void);
#endif /* FE_AUTH_H */
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index 8dd1a5960f6..7ab4a9a3623 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -875,7 +875,8 @@ PQconndefaults(void)
connOptions = conninfo_init(&errorBuf);
if (connOptions != NULL)
{
- if (!conninfo_add_defaults(connOptions, &errorBuf))
+ /* pass NULL errorBuf to ignore errors */
+ if (!conninfo_add_defaults(connOptions, NULL))
{
PQconninfoFree(connOptions);
connOptions = NULL;
@@ -4412,9 +4413,10 @@ conninfo_array_parse(const char *const * keywords, const char *const * values,
*
* Defaults are obtained from a service file, environment variables, etc.
*
- * Returns TRUE if successful, otherwise FALSE; errorMessage is filled in
- * upon failure. Note that failure to locate a default value is not an
- * error condition here --- we just leave the option's value as NULL.
+ * Returns TRUE if successful, otherwise FALSE; errorMessage, if supplied,
+ * is filled in upon failure. Note that failure to locate a default value
+ * is not an error condition here --- we just leave the option's value as
+ * NULL.
*/
static bool
conninfo_add_defaults(PQconninfoOption *options, PQExpBuffer errorMessage)
@@ -4424,9 +4426,10 @@ conninfo_add_defaults(PQconninfoOption *options, PQExpBuffer errorMessage)
/*
* If there's a service spec, use it to obtain any not-explicitly-given
- * parameters.
+ * parameters. Ignore error if no error message buffer is passed
+ * because there is no way to pass back the failure message.
*/
- if (parseServiceInfo(options, errorMessage) != 0)
+ if (parseServiceInfo(options, errorMessage) != 0 && errorMessage)
return false;
/*
@@ -4448,8 +4451,9 @@ conninfo_add_defaults(PQconninfoOption *options, PQExpBuffer errorMessage)
option->val = strdup(tmp);
if (!option->val)
{
- printfPQExpBuffer(errorMessage,
- libpq_gettext("out of memory\n"));
+ if (errorMessage)
+ printfPQExpBuffer(errorMessage,
+ libpq_gettext("out of memory\n"));
return false;
}
continue;
@@ -4465,8 +4469,9 @@ conninfo_add_defaults(PQconninfoOption *options, PQExpBuffer errorMessage)
option->val = strdup(option->compiled);
if (!option->val)
{
- printfPQExpBuffer(errorMessage,
- libpq_gettext("out of memory\n"));
+ if (errorMessage)
+ printfPQExpBuffer(errorMessage,
+ libpq_gettext("out of memory\n"));
return false;
}
continue;
@@ -4477,7 +4482,7 @@ conninfo_add_defaults(PQconninfoOption *options, PQExpBuffer errorMessage)
*/
if (strcmp(option->keyword, "user") == 0)
{
- option->val = pg_fe_getauthname(errorMessage);
+ option->val = pg_fe_getauthname();
continue;
}
}
--
GitLab