diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-02 15:19:32 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-02 15:19:32 +0200 |
| commit | 486b8b1cd193fb5bb12d4810b18e076bb1f3933b (patch) | |
| tree | 9bc050fe28432f3764006239a8ae060ffc3610f9 /sapi/phpdbg/phpdbg_utils.c | |
| parent | f733047ae2af425f0b83c7e7ac3f19166947cac5 (diff) | |
| parent | af4a9bf1bf9109714e0e45aaf907e9809abb6217 (diff) | |
| download | php-git-486b8b1cd193fb5bb12d4810b18e076bb1f3933b.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Fix #73927: phpdbg fails with windows error prompt at "watch array"
Diffstat (limited to 'sapi/phpdbg/phpdbg_utils.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_utils.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sapi/phpdbg/phpdbg_utils.c b/sapi/phpdbg/phpdbg_utils.c index 699f45b76d..56fb654909 100644 --- a/sapi/phpdbg/phpdbg_utils.c +++ b/sapi/phpdbg/phpdbg_utils.c @@ -471,11 +471,7 @@ PHPDBG_API int phpdbg_parse_variable_with_arg(char *input, size_t len, HashTable if (new_index && index_len == 0) { zend_ulong numkey; zend_string *strkey; - ZEND_HASH_FOREACH_KEY_PTR(parent, numkey, strkey, zv) { - while (Z_TYPE_P(zv) == IS_INDIRECT) { - zv = Z_INDIRECT_P(zv); - } - + ZEND_HASH_FOREACH_KEY_VAL_IND(parent, numkey, strkey, zv) { if (i == len || (i == len - 1 && input[len - 1] == ']')) { char *key, *propkey; size_t namelen, keylen; |