cvs: php-src /ext/xmlrpc xmlrpc-epi-php.c

tony2001 Wed Apr 12 15:14:43 2006 UTC Modified files: /php-src/ext/xmlrpc xmlrpc-epi-php.c Log: MF51: fix #37057 (xmlrpc_decode() may produce arrays with numeric string keys which are unaccessible) http://cvs.php.net/viewcvs.cgi/php-src/ext/xmlrpc/xmlrpc-epi-php.c?r1=1.43&r2=1.44&diff_format=u Index: php-src/ext/xmlrpc/xmlrpc-epi-php.c diff -u php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.43 php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.44 --- php-src/ext/xmlrpc/xmlrpc-epi-php.c:1.43 Sun Jan 1 13:09:56 2006 +++ php-src/ext/xmlrpc/xmlrpc-epi-php.c Wed Apr 12 15:14:43 2006 @@ -51,7 +51,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: xmlrpc-epi-php.c,v 1.43 2006/01/01 13:09:56 sniper Exp $ */ +/* $Id: xmlrpc-epi-php.c,v 1.44 2006/04/12 15:14:43 tony2001 Exp $ */ /********************************************************************** * BUGS: * @@ -300,7 +300,13 @@ { if (list && val) { if (id) { - return zend_hash_update(Z_ARRVAL_P(list), (char*) id, strlen(id) + 1, (void *) val, sizeof(zval **), NULL); + int id_len = strlen(id); + if (!(id_len > 1 && id[0] == '0') && is_numeric_string((char *)id, id_len, NULL, NULL, 0) == IS_LONG) { + long index = strtol(id, NULL, 0); + return zend_hash_index_update(Z_ARRVAL_P(list), index, (void *) val, sizeof(zval **), NULL); + } else { + return zend_hash_update(Z_ARRVAL_P(list), (char*) id, strlen(id) + 1, (void *) val, sizeof(zval **), NULL); + } } else { return zend_hash_next_index_insert(Z_ARRVAL_P(list), (void *) val, sizeof(zval **), NULL); }