From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 8 Dec 2005 03:25:42 +0000 (+0000)
Subject: MFB51: Fixed bug #35594 (Multiple calls to getopt() may result in a crash).
X-Git-Tag: RELEASE_1_0_4~477
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=331b7d7b273633c1957afa0378fab1df44afa309;p=php

MFB51: Fixed bug #35594 (Multiple calls to getopt() may result in a crash).
---

diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 914d339826..7999b759e7 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -1670,6 +1670,9 @@ PHP_FUNCTION(getopt)
 	/* Disable getopt()'s error messages. */
 	opterr = 0;
 
+	/* Force reinitialization of getopt() (via optind reset) on every call. */
+	optind = 0;
+
 	/* Invoke getopt(3) on the argument array. */
 #ifdef HARTMUT_0
 	while ((o = getopt_long(argc, argv, options, longopts, &longindex)) != -1) {