postgres.git / summary / log / commit / refs

commit    14fa9805604e829d96531581e71b45ddfddb4fc8
Author:   Heikki Linnakangas <heikki.linnakangas@iki.fi>
Date:     Tue Jan 15 16:54:03 2013 +0000
First released in: 9.3.0, 8.3.23, 8.4.16, 9.0.12, 9.1.8, 9.2.3

    Don't pass NULL to fprintf, if not currently connected to a database.
    
    Backpatch all the way to 8.3. Fixes bug #7811, per report and diagnosis by
    Meng Qingzhong.


 src/bin/psql/help.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index ac5edca65dd..ccbd542c617 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -157,6 +157,11 @@ void
 slashUsage(unsigned short int pager)
 {
 	FILE	   *output;
+	char	   *currdb;
+
+	currdb = PQdb(pset.db);
+	if (currdb == NULL)
+		currdb = _("none");
 
 	output = PageOutput(92, pager);
 
@@ -248,7 +253,7 @@ slashUsage(unsigned short int pager)
 	fprintf(output, _("Connection\n"));
 	fprintf(output, _("  \\c[onnect] [DBNAME|- USER|- HOST|- PORT|-]\n"
 	"                         connect to new database (currently \"%s\")\n"),
-			PQdb(pset.db));
+			currdb);
 	fprintf(output, _("  \\encoding [ENCODING]   show or set client encoding\n"));
 	fprintf(output, _("  \\password [USERNAME]   securely change the password for a user\n"));
 	fprintf(output, _("  \\conninfo              display information about current connection\n"));


[parent: d4c78c1811d1]