Commit 02e20bb2 authored by Alvaro Herrera's avatar Alvaro Herrera

Avoid crash in rare case of concurrent DROP

When a role being dropped contains is referenced by catalog objects that
are concurrently also being dropped, a crash can result while trying to
construct the string that describes the objects.  Suppress that by
ignoring objects whose descriptions are returned as NULL.

The majority of relevant codesites were already cautious about this
already; we had just missed a couple.

This is an old bug, so backpatch all the way back.
Reported-by: default avatarAlexander Lakhin <exclusion@gmail.com>
Discussion: https://postgr.es/m/17126-21887f04508cb5c8@postgresql.org
parent c829fbc3
......@@ -1102,6 +1102,10 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
objDesc = getObjectDescription(obj, false);
/* An object being dropped concurrently doesn't need to be reported */
if (objDesc == NULL)
continue;
/*
* If, at any stage of the recursive search, we reached the object via
* an AUTO, INTERNAL, PARTITION, or EXTENSION dependency, then it's
......@@ -1127,23 +1131,28 @@ reportDependentObjects(const ObjectAddresses *targetObjects,
char *otherDesc = getObjectDescription(&extra->dependee,
false);
if (numReportedClient < MAX_REPORTED_DEPS)
if (otherDesc)
{
if (numReportedClient < MAX_REPORTED_DEPS)
{
/* separate entries with a newline */
if (clientdetail.len != 0)
appendStringInfoChar(&clientdetail, '\n');
appendStringInfo(&clientdetail, _("%s depends on %s"),
objDesc, otherDesc);
numReportedClient++;
}
else
numNotReportedClient++;
/* separate entries with a newline */
if (clientdetail.len != 0)
appendStringInfoChar(&clientdetail, '\n');
appendStringInfo(&clientdetail, _("%s depends on %s"),
if (logdetail.len != 0)
appendStringInfoChar(&logdetail, '\n');
appendStringInfo(&logdetail, _("%s depends on %s"),
objDesc, otherDesc);
numReportedClient++;
pfree(otherDesc);
}
else
numNotReportedClient++;
/* separate entries with a newline */
if (logdetail.len != 0)
appendStringInfoChar(&logdetail, '\n');
appendStringInfo(&logdetail, _("%s depends on %s"),
objDesc, otherDesc);
pfree(otherDesc);
ok = false;
}
else
......
......@@ -1238,6 +1238,12 @@ storeObjectDescription(StringInfo descs,
{
char *objdesc = getObjectDescription(object, false);
/*
* An object being dropped concurrently doesn't need to be reported.
*/
if (objdesc == NULL)
return;
/* separate entries with a newline */
if (descs->len != 0)
appendStringInfoChar(descs, '\n');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment