From c9ae9cd47ef563fb897dd0c94e1cc7c322c0ecb4 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Fri, 16 Dec 2005 20:50:38 +0000 Subject: [PATCH] MF51: fix #35713 (getopt() returns array with numeric strings when passed options like '-1') TODO: make getopt() unicode aware --- ext/standard/basic_functions.c | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 7999b759e7..06218b8934 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -1573,6 +1573,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; @@ -1706,14 +1707,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