postgres.git / summary / log / commit / refs

commit    2930c05634bcb7491bc443a493405e927ed08443
Author:   Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date:     Wed Feb 20 14:22:47 2013 +0000

    Don't pass NULL to fprintf, if a bogus connection string is given to pg_dump.
    
    Back-patch to all supported branches.


 src/bin/pg_dump/pg_backup_db.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
index 21c203e8e7b..4c4f24f7d5a 100644
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -300,7 +300,8 @@ ConnectDatabase(Archive *AHX,
 	/* check to see that the backend connection was successfully made */
 	if (PQstatus(AH->connection) == CONNECTION_BAD)
 		exit_horribly(modulename, "connection to database \"%s\" failed: %s",
-					  PQdb(AH->connection), PQerrorMessage(AH->connection));
+					  PQdb(AH->connection) ? PQdb(AH->connection) : "",
+					  PQerrorMessage(AH->connection));
 
 	/* check for version mismatch */
 	_check_database_version(AH);


[parent: 5d6899dbae7a]