tony2001 Fri Dec 16 20:09:17 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/standard basic_functions.c
Log:
fix #35713 (getopt() returns array with numeric strings when passed options
like '-1')
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.295&r2=1.2027.2.296&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.295 php-src/NEWS:1.2027.2.296
--- php-src/NEWS:1.2027.2.295 Thu Dec 15 22:49:22 2005
+++ php-src/NEWS Fri Dec 16 20:09:16 2005
@@ -26,6 +26,8 @@
- 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)
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.13&r2=1.725.2.14&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.13
php-src/ext/standard/basic_functions.c:1.725.2.14
--- php-src/ext/standard/basic_functions.c:1.725.2.13 Thu Dec 8 03:25:22 2005
+++ php-src/ext/standard/basic_functions.c Fri Dec 16 20:09:16 2005
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.13 2005/12/08 03:25:22 iliaa Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.14 2005/12/16 20:09:16 tony2001 Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1568,6 +1568,7 @@
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 @@
}
/* 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);
+ }
}
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
