diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-02 18:35:35 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-02 18:35:35 +0100 |
| commit | 795a4c1bb384a7e0d56705d43e95b9bfcc3265b5 (patch) | |
| tree | dab5d313002ed8083a3667d1b560476a916e48ff | |
| parent | b2a4af7b58d2b06177fb4ea451056a8d9a28fbd0 (diff) | |
| parent | e81f30ad1d003c5250b1025c963ed0a178d4c51a (diff) | |
| download | php-git-795a4c1bb384a7e0d56705d43e95b9bfcc3265b5.tar.gz | |
Merge branch 'PHP-7.1'
| -rw-r--r-- | Zend/tests/bug73998.phpt | 19 | ||||
| -rw-r--r-- | Zend/zend_builtin_functions.c | 6 | ||||
| -rw-r--r-- | Zend/zend_hash.h | 10 |
3 files changed, 30 insertions, 5 deletions
diff --git a/Zend/tests/bug73998.phpt b/Zend/tests/bug73998.phpt new file mode 100644 index 0000000000..41813269d1 --- /dev/null +++ b/Zend/tests/bug73998.phpt @@ -0,0 +1,19 @@ +--TEST-- +Bug #73998 (array_key_exists fails on arrays created by get_object_vars) +--DESCRIPTION-- +Properties of objects with numeric names should be accessible +--FILE-- +<?php +$a = new stdClass; +$a->{1234} = "Numeric"; +$a->a1234 = "String"; + +$properties = get_object_vars($a); +var_dump(array_key_exists(1234, $properties)); +echo "Value: {$properties[1234]}\n"; + +?> +--EXPECT-- +bool(true) +Value: Numeric + diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 0f3e321ba3..4ba9dc4189 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -1284,11 +1284,7 @@ ZEND_FUNCTION(get_object_vars) */ zend_hash_str_add_new(Z_ARRVAL_P(return_value), prop_name, prop_len, value); } else { - if (ZEND_HANDLE_NUMERIC(key, num_key)) { - zend_hash_index_add(Z_ARRVAL_P(return_value), num_key, value); - } else { - zend_hash_add_new(Z_ARRVAL_P(return_value), key, value); - } + zend_symbtable_add_new(Z_ARRVAL_P(return_value), key, value); } } ZEND_HASH_FOREACH_END(); } diff --git a/Zend/zend_hash.h b/Zend/zend_hash.h index fa63999c2a..638fbe27fc 100644 --- a/Zend/zend_hash.h +++ b/Zend/zend_hash.h @@ -346,6 +346,16 @@ static zend_always_inline int zend_hash_str_exists_ind(const HashTable *ht, cons Z_TYPE_P(Z_INDIRECT_P(zv)) != IS_UNDEF); } +static zend_always_inline zval *zend_symbtable_add_new(HashTable *ht, zend_string *key, zval *pData) +{ + zend_ulong idx; + + if (ZEND_HANDLE_NUMERIC(key, idx)) { + return zend_hash_index_add_new(ht, idx, pData); + } else { + return zend_hash_add_new(ht, key, pData); + } +} static zend_always_inline zval *zend_symtable_update(HashTable *ht, zend_string *key, zval *pData) { |