NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit6338fa3

committed

Avoid platform-specific null pointer dereference in psql.

POSIX permits getopt() to advance optind beyond argc when the lastargv entry is an option that requires an argument and hasn't got one.It seems that no major platforms actually do that, but musl does,so that something like "psql -f" would crash with that libc.Add a check that optind is in range before trying to look at thepossibly-bogus option.Report and fix by Quentin Rameau. Back-patch to all supportedbranches.Discussion:https://postgr.es/m/20190825100617.GA6087@fifth.space

1 parentfaee5a1 commit6338fa3Copy full SHA for 6338fa3

File tree

1 file changed

-3

lines changed

src/bin/psql
- startup.c

1 file changed

-3

lines changed

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

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -666,15 +666,18 @@ parse_psql_options(int argc, char argv[], struct adhoc_opts options)`
`666`	`666`	`options->single_txn= true;`
`667`	`667`	`break;`
`668`	`668`	`case'?':`
`669`		`-/* Actual help option given */`
`670`		`-if (strcmp(argv[optind-1],"-?")==0)`
	`669`	`+if (optind <=argc&&`
	`670`	`+strcmp(argv[optind-1],"-?")==0)`
`671`	`671`	`{`
	`672`	`+/* actual help option given */`
`672`	`673`	`usage(NOPAGER);`
`673`	`674`	`exit(EXIT_SUCCESS);`
`674`	`675`	`}`
`675`		`-/* unknown option reported by getopt */`
`676`	`676`	`else`
	`677`	`+{`
	`678`	`+/* getopt error (unknown option or missing argument) */`
`677`	`679`	`gotounknown_option;`
	`680`	`+}`
`678`	`681`	`break;`
`679`	`682`	`case1:`
`680`	`683`	`{`

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!

Commit6338fa3

File tree

1 file changed

1 file changed

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

0 commit comments