DomainKey-Signature: a=rsa-sha1; c=nofws; d=fifth.space; h=date:from:to
	:subject:message-id:mime-version:content-type; q=dns; s=dkim; b=
	QpLJKFAUudhJSSN98014FlkiH4CK5YLSB7HzxdoMHg2TthRd3uN3LKS3VZw3YhdK
	X8awKXheNU+FeGj/DVKGD3Qgqp9WAiFjGY5LqG+gSUBkr+x7erfPSSEMVunOLEq7
	an/LSBWCXaV8uT3YuTdyVFZ+kclwY2Xv8DSJSwuSGaFQbRSg/L1LF6i0r7KNopVB
	0w9qAu4bMTzAVL4Du3ycNlCkXONC+IocJLj35wB5ckDhG0E8XxvEUnPdWPofezX2
	w/GoVxoKpi+xISdMM6FGZ4iM6IFMhYkubk2YBEFAJE8Rs3InmvIngVRhD9dnrBVG
	znS3pica1rxlhy1sxDPrGA==
Date: Sun, 25 Aug 2019 12:06:17 +0200
From: Quentin Rameau <quinq@fifth.space>
To: pgsql-hackers@postgresql.org
Subject: [PATCH] Fix missing argument handling in psql getopt
Message-ID: <20190825100617.GA6087@fifth.space>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
User-Agent: Mutt/1.11.4 (2019-03-13)
Precedence: bulk

When passing an argument option with a missing argument, strcmp would
be called with the argv terminating NULL.
---
 src/bin/psql/startup.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 4730c73396..cffbfc864e 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -667,12 +667,13 @@ parse_psql_options(int argc, char *argv[], struct adhoc_opts *options)
 				break;
 			case '?':
 				/* Actual help option given */
-				if (strcmp(argv[optind - 1], "-?") == 0)
+				if (optind <= argc &&
+				    strcmp(argv[optind - 1], "-?") == 0)
 				{
 					usage(NOPAGER);
 					exit(EXIT_SUCCESS);
 				}
-				/* unknown option reported by getopt */
+				/* unknown option or missing argument */
 				else
 					goto unknown_option;
 				break;
-- 
2.23.0