From 745becce3321267a4530af286433d1dc6f043360 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Fri, 31 Jul 2026 12:44:51 +0900 Subject: [PATCH] Fix error handling in port's getopt_long() for missing argument In the long option error path, the code previously returned BADARG immediately when optstring[0] == ':' for a missing required argument, without advancing "optind" or resetting "place". This error handling was inconsistent with the short option path, where both updates are performed before returning BADARG (and inconsistent with libc, additionally..). This affects platforms where our port version of getopt_long() is used, a concept that should be limited to WIN32 these days. An argument could be made in favor of a backpatch, but this could lead to a slight different error handling, for a report that would only show up when using incorrect option combinations. Author: Japin Li Discussion: https://postgr.es/m/SY7PR01MB10921AF81F18A8BCFA06388BEB6C22@SY7PR01MB10921.ausprd01.prod.outlook.com --- src/port/getopt_long.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/port/getopt_long.c b/src/port/getopt_long.c index 20953db9db1..2e869fed58b 100644 --- a/src/port/getopt_long.c +++ b/src/port/getopt_long.c @@ -145,8 +145,12 @@ retry: } else { + optind++; if (optstring[0] == ':') + { + place = EMSG; return BADARG; + } if (opterr && has_arg == required_argument) fprintf(stderr, @@ -154,7 +158,6 @@ retry: argv[0], place); place = EMSG; - optind++; if (has_arg == required_argument) return BADCH;