aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2010-09-23 16:53:53 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2010-09-23 16:53:53 -0400
commit1e4a7c41102288955b290926b51c556fe8cb7daa (patch)
tree6fff96b385f8c1d3fcd709760e4f883950d0358d
parent767ae95bedf06b02f824830339ef3dcd8e12898b (diff)
downloadpostgresql-1e4a7c41102288955b290926b51c556fe8cb7daa.tar.gz
postgresql-1e4a7c41102288955b290926b51c556fe8cb7daa.zip
Prevent show_session_authorization from crashing when session_authorization
hasn't been set. The only known case where this can happen is when show_session_authorization is invoked in an autovacuum process, which is possible if an index function calls it, as for example in bug #5669 from Andrew Geery. We could perhaps try to return a sensible value, such as the name of the cluster-owning superuser; but that seems like much more trouble than the case is worth, and in any case it could create new possible failure modes. Simply returning an empty string seems like the most appropriate fix. Back-patch to all supported versions, even those before autovacuum, just in case there's another way to provoke this crash.
-rw-r--r--src/backend/commands/variable.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 4076312799d..ff68381d79a 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -830,6 +830,10 @@ show_session_authorization(void)
AclId savedsysid;
char *endptr;
+ /* If session_authorization hasn't been set in this process, return "" */
+ if (value == NULL || value[0] == '\0')
+ return "";
+
Assert(strspn(value, "x") == NAMEDATALEN &&
(value[NAMEDATALEN] == 'T' || value[NAMEDATALEN] == 'F'));