postgres.git / summary / log / commit / refs

commit    f7a9a3d4b24a4ad0de7992f01a0dd2a02ccd30a4
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Tue Jul 27 01:39:05 2021 +0000

    Skip trailing whitespaces when parsing integer options
    
    strtoint(), via strtol(), would skip leading whitespaces but the same
    rule was not applied for trailing whitespaces, leading to an
    inconsistent behavior.  Some tests are changed to cover more this area.
    
    Author: Michael Paquier
    Reviewed-by: Kyotaro Horiguchi
    Discussion: https://postgr.es/m/YP5Pv0d13Ct+03ve@paquier.xyz


 src/bin/pg_basebackup/t/020_pg_receivewal.pl | 4 +++-
 src/bin/pg_dump/t/001_basic.pl               | 3 ++-
 src/fe_utils/option_utils.c                  | 9 ++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/bin/pg_basebackup/t/020_pg_receivewal.pl b/src/bin/pg_basebackup/t/020_pg_receivewal.pl
index 158f7d176fe..47c4ecb073b 100644
--- a/src/bin/pg_basebackup/t/020_pg_receivewal.pl
+++ b/src/bin/pg_basebackup/t/020_pg_receivewal.pl
@@ -88,10 +88,12 @@ SKIP:
 	$primary->psql('postgres',
 		'INSERT INTO test_table VALUES (generate_series(100,200));');
 
+	# Note the trailing whitespace after the value of --compress, that is
+	# a valid value.
 	$primary->command_ok(
 		[
 			'pg_receivewal', '-D',     $stream_dir,  '--verbose',
-			'--endpos',      $nextlsn, '--compress', '1'
+			'--endpos',      $nextlsn, '--compress', '1 '
 		],
 		"streaming some WAL using ZLIB compression");
 
diff --git a/src/bin/pg_dump/t/001_basic.pl b/src/bin/pg_dump/t/001_basic.pl
index 59de6df7bad..d1a7e1db405 100644
--- a/src/bin/pg_dump/t/001_basic.pl
+++ b/src/bin/pg_dump/t/001_basic.pl
@@ -101,8 +101,9 @@ command_fails_like(
 	qr/\Qpg_dump: error: parallel backup only supported by the directory format\E/,
 	'pg_dump: parallel backup only supported by the directory format');
 
+# Note the trailing whitespace for the value of --jobs, that is valid.
 command_fails_like(
-	[ 'pg_dump', '-j', '-1' ],
+	[ 'pg_dump', '-j', '-1 ' ],
 	qr/\Qpg_dump: error: -j\/--jobs must be in range\E/,
 	'pg_dump: -j/--jobs must be in range');
 
diff --git a/src/fe_utils/option_utils.c b/src/fe_utils/option_utils.c
index 3e7e512ad91..bcfe7365fd3 100644
--- a/src/fe_utils/option_utils.c
+++ b/src/fe_utils/option_utils.c
@@ -57,7 +57,14 @@ option_parse_int(const char *optarg, const char *optname,
 	errno = 0;
 	val = strtoint(optarg, &endptr, 10);
 
-	if (*endptr)
+	/*
+	 * Skip any trailing whitespace; if anything but whitespace remains before
+	 * the terminating character, fail.
+	 */
+	while (*endptr != '\0' && isspace((unsigned char) *endptr))
+		endptr++;
+
+	if (*endptr != '\0')
 	{
 		pg_log_error("invalid value \"%s\" for option %s",
 					 optarg, optname);


[parent: 21b3aa9c8faf]