NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit49008d6

committed

Fix null pointer dereference in "\c" psql command.

The psql crash happened when no current connection existed. (The secondnew check is optional given today's undocumented NULL argument handlingin PQhost() etc.) Back-patch to 9.0 (all supported versions).

1 parentdca992d commit49008d6Copy full SHA for 49008d6

File tree

1 file changed

-2

lines changed

src/bin/psql
- command.c

1 file changed

-2

lines changed

`‎src/bin/psql/command.c`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1591,7 +1591,8 @@ do_connect(char dbname, char user, char host, char port)`
`1591`	`1591`	`* syntax.`
`1592`	`1592`	`*/`
`1593`	`1593`	`keep_password=`
`1594`		`-((strcmp(user,PQuser(o_conn))==0)&&`
	`1594`	`+(o_conn&&`
	`1595`	`+ (strcmp(user,PQuser(o_conn))==0)&&`
`1595`	`1596`	`(!host\|\|strcmp(host,PQhost(o_conn))==0)&&`
`1596`	`1597`	`(strcmp(port,PQport(o_conn))==0)&&`
`1597`	`1598`	`!has_connection_string);`
`@@ -1718,7 +1719,8 @@ do_connect(char dbname, char user, char host, char port)`
`1718`	`1719`	`/* Tell the user about the new connection */`
`1719`	`1720`	`if (!pset.quiet)`
`1720`	`1721`	`{`
`1721`		`-if (param_is_newly_set(PQhost(o_conn),PQhost(pset.db))\|\|`
	`1722`	`+if (!o_conn\|\|`
	`1723`	`+param_is_newly_set(PQhost(o_conn),PQhost(pset.db))\|\|`
`1722`	`1724`	`param_is_newly_set(PQport(o_conn),PQport(pset.db)))`
`1723`	`1725`	`{`
`1724`	`1726`	`char*host=PQhost(pset.db);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit49008d6

File tree

1 file changed

1 file changed

`‎src/bin/psql/command.c`

0 commit comments