diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-04-12 15:13:57 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-04-12 15:13:57 +0000 |
| commit | 195271dd23ba6779d0e39d7614327fb4c3bc121f (patch) | |
| tree | eb5f0ceec433ea7ff927248b59123d1b07be837f /ext/xmlrpc/xmlrpc-epi-php.c | |
| parent | bac1fda3366198846d36cc8eae5b0ab1058bc45d (diff) | |
| download | php-git-195271dd23ba6779d0e39d7614327fb4c3bc121f.tar.gz | |
fix #37057 (xmlrpc_decode() may produce arrays with numeric strings which are unaccessible)
Diffstat (limited to 'ext/xmlrpc/xmlrpc-epi-php.c')
| -rw-r--r-- | ext/xmlrpc/xmlrpc-epi-php.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/xmlrpc/xmlrpc-epi-php.c b/ext/xmlrpc/xmlrpc-epi-php.c index 871340132c..8b6f963f5d 100644 --- a/ext/xmlrpc/xmlrpc-epi-php.c +++ b/ext/xmlrpc/xmlrpc-epi-php.c @@ -300,7 +300,13 @@ static int add_zval(zval* list, const char* id, zval** val) { 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); } |