database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Don't pass NULL to fprintf, if not currently connected to a database.

Browse Source 
Backpatch all the way to 8.3. Fixes bug #7811, per report and diagnosis by
Meng Qingzhong.
This commit is contained in:
Heikki Linnakangas
2013-01-15 18:54:03 +02:00
parent d4c78c1811
commit 14fa980560
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/bin/psql/help.c
View File

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