From 4529c77c01bd0a2f1718c6dc45a2896191b72001 Mon Sep 17 00:00:00 2001 From: "Chao Li (Evan)" Date: Wed, 15 Apr 2026 13:32:12 +0800 Subject: [PATCH v1] ddlutils: error out when pg_get_database_ddl() sees a missing tablespace pg_get_database_ddl_internal() calls get_tablespace_name() for a database's dattablespace, and then passes the result to pg_strcasecmp() without checking for NULL first. Fix that by detecting the missing tablespace explicitly and raising an ERROR with ERRCODE_UNDEFINED_OBJECT. Author: Chao Li Reviewed-by: Discussion: https://postgr.es/m/ --- src/backend/utils/adt/ddlutils.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/backend/utils/adt/ddlutils.c b/src/backend/utils/adt/ddlutils.c index c4f9f86c43e..6ab354e42f6 100644 --- a/src/backend/utils/adt/ddlutils.c +++ b/src/backend/utils/adt/ddlutils.c @@ -976,6 +976,13 @@ pg_get_database_ddl_internal(Oid dbid, bool pretty, { char *spcname = get_tablespace_name(dbform->dattablespace); + if (spcname == NULL) + ereport(ERROR, + errcode(ERRCODE_UNDEFINED_OBJECT), + errmsg("tablespace with OID %u does not exist", + dbform->dattablespace), + errhint("To recover, try ALTER DATABASE ... SET TABLESPACE ... to a valid tablespace.")); + if (pg_strcasecmp(spcname, "pg_default") != 0) append_ddl_option(&buf, pretty, 4, "TABLESPACE = %s", quote_identifier(spcname)); -- 2.50.1 (Apple Git-155)