diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2013-01-15 18:54:03 +0200 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2013-01-15 19:23:47 +0200 |
| commit | b04ce529fd38b1d00492d03acf896f9293b6fb28 (patch) | |
| tree | 8a5312e1e3f84cb5c6f107efa102173835279deb | |
| parent | 7ac5760fa283bc090c25e4ea495a0d2bb41db7b5 (diff) | |
| download | postgresql-b04ce529fd38b1d00492d03acf896f9293b6fb28.tar.gz postgresql-b04ce529fd38b1d00492d03acf896f9293b6fb28.zip | |
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.
| -rw-r--r-- | src/bin/psql/help.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c index 1070bc521e0..ef36583db8b 100644 --- a/src/bin/psql/help.c +++ b/src/bin/psql/help.c @@ -161,6 +161,11 @@ void slashUsage(unsigned short int pager) { FILE *output; + char *currdb; + + currdb = PQdb(pset.db); + if (currdb == NULL) + currdb = _("none"); output = PageOutput(94, pager); @@ -254,7 +259,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")); |