From 418223e2f629ba63392c5b2fff7470cdd3484eac Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Fri, 16 Dec 2005 20:09:16 +0000 Subject: [PATCH] fix #35713 (getopt() returns array with numeric strings when passed options like '-1') --- NEWS | 2 ++ ext/standard/basic_functions.c | 29 ++++++++++++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 1d179f8e1b..4cd6cb923e 100644 --- a/NEWS +++ b/NEWS @@ -26,6 +26,8 @@ PHP NEWS - Fixed many bugs in OCI8. (Tony) - Fixed crash and leak in mysqli when using 4.1.x client libraries and connecting to 5.x server. (Andrey) +- Fixed bug #35713 (getopt() returns array with numeric strings when passed + options like '-1'). (Tony) - Fixed bug #35694 (Improved error message for invalid fetch mode). (Ilia) - Fixed bug #35692 (iconv_mime_decode() segmentation fault; with libiconv only). (Tony) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 604ddf091d..583d7bdbc8 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1568,6 +1568,7 @@ PHP_FUNCTION(getopt) char *optname; int argc = 0, options_len = 0, o; zval *val, **args = NULL, *p_longopts = NULL; + int optname_len = 0; #ifdef HARTMUT_0 struct option *longopts = NULL; int longindex = 0; @@ -1701,14 +1702,28 @@ PHP_FUNCTION(getopt) } /* Add this option / argument pair to the result hash. */ - if(zend_hash_find(HASH_OF(return_value), optname, strlen(optname)+1, (void **)&args) != FAILURE) { - if(Z_TYPE_PP(args) != IS_ARRAY) { - convert_to_array_ex(args); - } - zend_hash_next_index_insert(HASH_OF(*args), (void *)&val, sizeof(zval *), NULL); + optname_len = strlen(optname); + if (!(optname_len > 1 && optname[0] == '0') && is_numeric_string(optname, optname_len, NULL, NULL, 0) == IS_LONG) { + /* numeric string */ + int optname_int = atoi(optname); + if(zend_hash_index_find(HASH_OF(return_value), optname_int, (void **)&args) != FAILURE) { + if(Z_TYPE_PP(args) != IS_ARRAY) { + convert_to_array_ex(args); + } + zend_hash_next_index_insert(HASH_OF(*args), (void *)&val, sizeof(zval *), NULL); + } else { + zend_hash_index_update(HASH_OF(return_value), optname_int, &val, sizeof(zval *), NULL); + } } else { - zend_hash_add(HASH_OF(return_value), optname, strlen(optname)+1, (void *)&val, - sizeof(zval *), NULL); + /* other strings */ + if(zend_hash_find(HASH_OF(return_value), optname, strlen(optname)+1, (void **)&args) != FAILURE) { + if(Z_TYPE_PP(args) != IS_ARRAY) { + convert_to_array_ex(args); + } + zend_hash_next_index_insert(HASH_OF(*args), (void *)&val, sizeof(zval *), NULL); + } else { + zend_hash_add(HASH_OF(return_value), optname, strlen(optname)+1, (void *)&val, sizeof(zval *), NULL); + } } } -- 2.40.0