pgsql: Fix optional-argument handling in in-tree getopt_long().

From: Nathan Bossart <nathan(at)postgresql(dot)org>
To: pgsql-committers(at)lists(dot)postgresql(dot)org
Subject: pgsql: Fix optional-argument handling in in-tree getopt_long().
Date: 2026-09-11 19:38:29
Message-ID: E1x574u-00000004Tlh-2T44@gemulon.postgresql.org
Views: Whole Thread | Raw Message | Download mbox | Resend email
Thread:
Lists: pgsql-committers

Fix optional-argument handling in in-tree getopt_long().

If a long option that accepts an optional argument is given without
one, optind is advanced twice, and the following argument is
skipped. For example, "pg_waldump --stats --limit 5" skips --limit
and interprets "5" as a non-option, so the command complains that
it cannot location WAL file "5". The same path also returns BADARG
when optstring starts with a colon, even though nothing is missing.
To fix, handle optional arguments before the missing-argument code,
which then only needs to deal with required arguments.

This is a bug fix and could be back-patched, but since this issue
went unnoticed for 23 years, I'm not going to bother.

Author: Sehrope Sarkuni <sehrope(at)jackdb(dot)com>
Reviewed-by: solai v <solai(dot)cdac(at)gmail(dot)com>
Discussion: https://postgr.es/m/CAH7T-arxDuVCSkorO%3Dk7%2BM-_JV0JFzMpN_EtKMyD2K0RDqZ2OA%40mail.gmail.com

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/61aa17b92eab017d64419c19fa466d72a509d016

Modified Files
--------------
src/bin/pg_waldump/t/001_basic.pl | 3 +--
src/port/getopt_long.c | 11 +++++------
2 files changed, 6 insertions(+), 8 deletions(-)

Browse pgsql-committers by date

  From Date Subject
Next Message Nathan Bossart 2026-09-11 20:20:00 pgsql: Fix option argument lookup in in-tree getopt_long().
Previous Message Peter Eisentraut 2026-09-11 19:33:21 pgsql: Remove unused global variables