mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid platform-specific null pointer dereference in psql.

Browse Source 
POSIX permits getopt() to advance optind beyond argc when the last
argv 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 the
possibly-bogus option.

Report and fix by Quentin Rameau.  Back-patch to all supported
branches.

Discussion: https://postgr.es/m/20190825100617.GA6087@fifth.space
This commit is contained in:
Tom Lane 2019-08-25 15:04:04 -04:00
parent faee5a12ec
commit 6338fa3e71
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bin/psql/startup.c
View File

@ -666,15 +666,18 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts *options)
options->single_txn = true;
break;
case '?':
/* Actual help option given */
if (strcmp(argv[optind - 1], "-?") == 0)
if (optind <= argc &&
strcmp(argv[optind - 1], "-?") == 0)
{
/* actual help option given */
usage(NOPAGER);
exit(EXIT_SUCCESS);
}
/* unknown option reported by getopt */
else
{
/* getopt error (unknown option or missing argument) */
goto unknown_option;
}
break;
case 1:
{