Skip to content

fix(cli): clear getopt optarg for optional long options #21902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iluuu1994 merged 1 commit into from
May 1, 2026
+19 −0
Merged

fix(cli): clear getopt optarg for optional long options #21902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 8.5.7

- CLI:
. Fixed bug GH-21901 (Stale getopt() optional value). (onthebed)

- Opcache:
. Fixed tracing JIT crash when a VM interrupt is handled during an observed
user function call. (Levi Morrison)
Expand Down
3 changes: 3 additions & 0 deletions main/getopt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char
static char **prev_optarg = NULL;

php_optidx = -1;
if (optarg) {
*optarg = NULL;
}

if(prev_optarg && prev_optarg != optarg) {
/* reset the state */
Expand Down
13 changes: 13 additions & 0 deletions sapi/cli/tests/gh21901.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
--TEST--
Stale getopt() optional value in CLI
--FILE--
<?php
$php_escaped = getenv('TEST_PHP_EXECUTABLE_ESCAPED');
$cmd = $php_escaped . ' -n -d foo=bar --ini';
echo shell_exec($cmd);
?>
--EXPECTF--
Configuration File (php.ini) Path: "%S"
Loaded Configuration File: "%S"
Scan for additional .ini files in: %s
Additional .ini files parsed: %s
Loading