Commitbb9a9a9

committed

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 byMeng Qingzhong.

1 parent78298da commitbb9a9a9Copy full SHA for bb9a9a9

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -161,6 +161,11 @@ void`
`161`	`161`	`slashUsage(unsigned shortintpager)`
`162`	`162`	`{`
`163`	`163`	`FILE*output;`
	`164`	`+char*currdb;`
	`165`	`+`
	`166`	`+currdb=PQdb(pset.db);`
	`167`	`+if (currdb==NULL)`
	`168`	`+currdb=_("none");`
`164`	`169`
`165`	`170`	`output=PageOutput(86,pager);`
`166`	`171`
`@@ -246,7 +251,7 @@ slashUsage(unsigned short int pager)`
`246`	`251`	`fprintf(output,_("Connection\n"));`
`247`	`252`	`fprintf(output,_(" \\c[onnect] [DBNAME\|- USER\|- HOST\|- PORT\|-]\n"`
`248`	`253`	`" connect to new database (currently \"%s\")\n"),`
`249`		`-PQdb(pset.db));`
	`254`	`+currdb);`
`250`	`255`	`fprintf(output,_(" \\encoding [ENCODING] show or set client encoding\n"));`
`251`	`256`	`fprintf(output,_(" \\password [USERNAME] securely change the password for a user\n"));`
`252`	`257`	`fprintf(output,"\n");`

Comments

(0)