Repair unsafe/unportable snprintf usage in pg_restore.

warn_or_exit_horribly() was blithely passing a potentially-NULL
string pointer to a %s format specifier.  That works (at least
to the extent of not crashing) on some platforms, but not all,
and since we switched to our own snprintf.c it doesn't work
for us anywhere.

Of the three string fields being handled this way here, I think
that only "owner" is supposed to be nullable ... but considering
that this is error-reporting code, it has very little business
assuming anything, so put in defenses for all three.

Per a crash observed on buildfarm member crake and then
reproduced here.  Because of the portability aspect,
back-patch to all supported versions.

diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index d2e2e16adcac780fa74e3884850af8ec075abd02..9dd2c36db39f59a12eed9906469de23fefff2107 100644 (file)
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -1773,8 +1773,11 @@ warn_or_exit_horribly(ArchiveHandle *AH,
        {
                write_msg(modulename, "Error from TOC entry %d; %u %u %s %s %s\n",
                                  AH->currentTE->dumpId,
-                        AH->currentTE->catalogId.tableoid, AH->currentTE->catalogId.oid,
-                         AH->currentTE->desc, AH->currentTE->tag, AH->currentTE->owner);
+                                 AH->currentTE->catalogId.tableoid,
+                                 AH->currentTE->catalogId.oid,
+                                 AH->currentTE->desc ? AH->currentTE->desc : "(no desc)",
+                                 AH->currentTE->tag ? AH->currentTE->tag : "(no tag)",
+                                 AH->currentTE->owner ? AH->currentTE->owner : "(no owner)");
        }
        AH->lastErrorStage = AH->stage;
        AH->lastErrorTE = AH->currentTE;