From 8aaec7d151567385c43d8966f46f0e5e4837c93c Mon Sep 17 00:00:00 2001 From: Quentin Rameau Date: Sun, 25 Aug 2019 20:45:29 +0200 Subject: [PATCH] Fix handling of ? option Using optind to check back the original given option this way is bogus and could lead to dereferencing argv out of bounds with a missing argument to an option. The proper way to verify if an error has occured is to check if optopt has been set. --- src/bin/psql/startup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c index 4730c73396..e5f6894177 100644 --- a/src/bin/psql/startup.c +++ b/src/bin/psql/startup.c @@ -667,7 +667,7 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts *options) break; case '?': /* Actual help option given */ - if (strcmp(argv[optind - 1], "-?") == 0) + if (!optopt) { usage(NOPAGER); exit(EXIT_SUCCESS); -- 2.23.0