mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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 7ac5760fa2
commit b04ce529fd
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,6 +161,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(94, pager); output = PageOutput(94, pager);
@ -254,7 +259,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"));