From: Antony Dovgal <tony2001@php.net>
Date: Thu, 8 Apr 2010 15:27:21 +0000 (+0000)
Subject: make sure the actual length of the argument passed matches the
X-Git-Tag: php-5.4.0alpha1~191^2~1789
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=14d1095a5c3f9d31137e16417efaa86425e9d769;p=php

make sure the actual length of the argument passed matches the
length of the argument declared
this fixes things like `php --zend-exten=1` or `php-fpm --fpm-con=conf`
---

diff --git a/main/getopt.c b/main/getopt.c
index 1f0be6842e..c40d4607ac 100644
--- a/main/getopt.c
+++ b/main/getopt.c
@@ -107,9 +107,15 @@ PHPAPI int php_getopt(int argc, char* const *argv, const opt_struct opts[], char
 				break;
 			}
 		}
-		optchr = 0;
-		dash = 0;
-		arg_start += strlen(opts[php_optidx].opt_name);
+
+		if (arg_end == strlen(opts[php_optidx].opt_name)) {
+			optchr = 0;
+			dash = 0;
+			arg_start += strlen(opts[php_optidx].opt_name);
+		} else {
+			(*optind)++;
+			return (php_opt_error(argc, argv, *optind-1, optchr, OPTERRNF, show_err));
+		}
 	} else {
 		if (!dash) {
 			dash = 1;