summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2010-09-23 16:53:33 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2010-09-23 16:53:33 -0400
commit7548ecb37380393fe6457fb405cdc86dd34a3390 (patch)
tree39ed4f1ae56d59729024c07432d08ba79c1ee915
parent9e20bdf9a8417615f40ddf3c8e6e34be2e7e88e2 (diff)
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 b16c1d38f60..b6bf4e1dc24 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -773,6 +773,10 @@ show_session_authorization(void)
Oid savedoid;
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'));