postgres.git / summary / log / commit / refs
commit bb0615c890e2b64d6959ac5c61bf47d206c5d70f
Author: Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date: Sat Oct 31 11:24:50 2026 +0000
First released in: 14.25, 15.20, 16.16, 17.12, 18.7, 19.0
Fix two crashes on a concurrently dropped schema
pg_identify_object() looks up the object's schema name without a lock
on the schema, so a concurrent DROP SCHEMA can make get_namespace_name()
return NULL, which was then passed to quote_identifier(). Report the
schema as NULL instead, as is already done for objects that have gone
away.
Similarly, schema_to_xml() and the related SQL/XML functions look up
the schema name without a lock on the schema, and a concurrent DROP
SCHEMA can make get_namespace_name() return NULL, which was then
dereferenced. Report that the schema does not exist, or skip it when
mapping all schemas of the database.
Author: Baji Shaik <baji.pgdev@gmail.com>
Discussion: https://www.postgresql.org/message-id/CA+fm-RPD0m9QL8W+804SGBBxn5iFz5wn=kncaP9SkM-s4PUANw@mail.gmail.com
Backpatch-through: 14
src/backend/catalog/objectaddress.c | 13 +++++++-----
src/backend/utils/adt/xml.c | 40 ++++++++++++++++++++++++++++++-------
2 files changed, 41 insertions(+), 12 deletions(-)
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index d85e9f8f78d..da0c3c7401c 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -4361,15 +4361,18 @@ pg_identify_object(PG_FUNCTION_ARGS)
objidentity = getObjectIdentity(&address, true);
/* schema name */
+ nulls[1] = true;
if (OidIsValid(schema_oid) && objidentity)
{
- const char *schema = quote_identifier(get_namespace_name(schema_oid));
+ char *nspname = get_namespace_name(schema_oid);
- values[1] = CStringGetTextDatum(schema);
- nulls[1] = false;
+ /* The schema may have been dropped concurrently; report it as NULL */
+ if (nspname != NULL)
+ {
+ values[1] = CStringGetTextDatum(quote_identifier(nspname));
+ nulls[1] = false;
+ }
}
- else
- nulls[1] = true;
/* object name */
if (objname && objidentity)
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
index b07f2d186d8..f18c208f65f 100644
--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -2879,12 +2879,22 @@ schema_to_xml_internal(Oid nspid, const char *xmlschema, bool nulls,
bool tableforest, const char *targetns, bool top_level)
{
StringInfo result;
+ char *nspname;
char *xmlsn;
List *relid_list;
ListCell *cell;
- xmlsn = map_sql_identifier_to_xml_name(get_namespace_name(nspid),
- true, false);
+ /*
+ * The schema may have been dropped concurrently, as we hold no lock on
+ * it. Report that rather than passing a NULL name below.
+ */
+ nspname = get_namespace_name(nspid);
+ if (nspname == NULL)
+ ereport(ERROR,
+ (errcode(ERRCODE_UNDEFINED_SCHEMA),
+ errmsg("schema with OID %u does not exist", nspid)));
+
+ xmlsn = map_sql_identifier_to_xml_name(nspname, true, false);
result = makeStringInfo();
xmldata_root_element_start(result, xmlsn, xmlschema, targetns, top_level);
@@ -3328,6 +3338,15 @@ map_sql_schema_to_xmlschema_types(Oid nspid, List *relid_list, bool nulls,
dbname = get_database_name(MyDatabaseId);
nspname = get_namespace_name(nspid);
+ /*
+ * The schema may have been dropped concurrently, as we hold no lock on
+ * it. Report that rather than passing a NULL name below.
+ */
+ if (nspname == NULL)
+ ereport(ERROR,
+ (errcode(ERRCODE_UNDEFINED_SCHEMA),
+ errmsg("schema with OID %u does not exist", nspid)));
+
initStringInfo(&result);
xmlsn = map_sql_identifier_to_xml_name(nspname, true, false);
@@ -3417,11 +3436,18 @@ map_sql_catalog_to_xmlschema_types(List *nspid_list, bool nulls,
{
Oid nspid = lfirst_oid(cell);
char *nspname = get_namespace_name(nspid);
- char *xmlsn = map_sql_identifier_to_xml_name(nspname, true, false);
- char *schematypename = map_multipart_sql_identifier_to_xml_name("SchemaType",
- dbname,
- nspname,
- NULL);
+ char *xmlsn;
+ char *schematypename;
+
+ /* Skip a schema that was concurrently dropped; it was not scanned. */
+ if (nspname == NULL)
+ continue;
+
+ xmlsn = map_sql_identifier_to_xml_name(nspname, true, false);
+ schematypename = map_multipart_sql_identifier_to_xml_name("SchemaType",
+ dbname,
+ nspname,
+ NULL);
appendStringInfo(&result,
" <xsd:element name=\"%s\" type=\"%s\"/>\n",
[parent: a1d165d63cc8]