diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-27 18:26:32 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-06-02 15:17:40 +0200 |
| commit | af4a9bf1bf9109714e0e45aaf907e9809abb6217 (patch) | |
| tree | a5eda3272e96ffc8fab505d3e12d0d1fa681863b /sapi/phpdbg/phpdbg_utils.c | |
| parent | 461135009c9c5e5a5839f22aff23ee7c896fb730 (diff) | |
| download | php-git-af4a9bf1bf9109714e0e45aaf907e9809abb6217.tar.gz | |
Fix #73927: phpdbg fails with windows error prompt at "watch array"
We expect zvals, so we should request zvals.
We also suppress spurious watchpoint removal notices.
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 dca70deb8f..d32f2fb7f8 100644 --- a/sapi/phpdbg/phpdbg_utils.c +++ b/sapi/phpdbg/phpdbg_utils.c @@ -473,11 +473,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; |