archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

MF51: fix #35713 (getopt() returns array with numeric strings when passed options like '-1')

Browse source 
TODO:
make getopt() unicode aware
This commit is contained in:
Antony Dovgal 2005-12-16 20:50:38 +00:00
parent 4abc190946
commit c9ae9cd47e
1 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ext/standard/basic_functions.c
View file

@ -1573,6 +1573,7 @@ PHP_FUNCTION(getopt)
char *optname; char *optname;
int argc = 0, options_len = 0, o; int argc = 0, options_len = 0, o;
zval *val, **args = NULL, *p_longopts = NULL; zval *val, **args = NULL, *p_longopts = NULL;
int optname_len = 0;
#ifdef HARTMUT_0 #ifdef HARTMUT_0
struct option *longopts = NULL; struct option *longopts = NULL;
int longindex = 0; int longindex = 0;
@ -1706,14 +1707,28 @@ PHP_FUNCTION(getopt)
} }
/* Add this option / argument pair to the result hash. */ /* Add this option / argument pair to the result hash. */
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 {
/* other strings */
if(zend_hash_find(HASH_OF(return_value), optname, strlen(optname)+1, (void **)&args) != FAILURE) { if(zend_hash_find(HASH_OF(return_value), optname, strlen(optname)+1, (void **)&args) != FAILURE) {
if(Z_TYPE_PP(args) != IS_ARRAY) { if(Z_TYPE_PP(args) != IS_ARRAY) {
convert_to_array_ex(args); convert_to_array_ex(args);
} }
zend_hash_next_index_insert(HASH_OF(*args), (void *)&val, sizeof(zval *), NULL); zend_hash_next_index_insert(HASH_OF(*args), (void *)&val, sizeof(zval *), NULL);
} else { } else {
zend_hash_add(HASH_OF(return_value), optname, strlen(optname)+1, (void *)&val, zend_hash_add(HASH_OF(return_value), optname, strlen(optname)+1, (void *)&val, sizeof(zval *), NULL);
sizeof(zval *), NULL); }
} }
} }