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.
REL8_4_STABLE
Heikki Linnakangas 13 years ago
parent e2120d7568
commit 20df7e9053
  1. 7
      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(86, pager);
@ -244,7 +249,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, "\n");

Loading…
Cancel
Save