mirror of
https://github.com/php/php-src.git
synced 2024-11-24 10:24:11 +08:00
fix #37057 (xmlrpc_decode() may produce arrays with numeric strings which are unaccessible)
This commit is contained in:
parent
bac1fda336
commit
195271dd23
2
NEWS
2
NEWS
@ -1,6 +1,8 @@
|
||||
PHP NEWS
|
||||
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
||||
?? Apr 2006, PHP 5.1.3
|
||||
- Fixed bug #37057 (xmlrpc_decode() may produce arrays with numeric strings,
|
||||
which are unaccessible). (Tony)
|
||||
- Fixed bug #37055 (incorrect reference counting for persistent OCI8
|
||||
connections). (Tony)
|
||||
- Fixed bug #37053 (html_errors with internal classes produces wrong links).
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user