diff options
| author | Matteo Beccati <mbeccati@php.net> | 2019-04-03 14:36:20 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2019-04-03 14:36:20 +0200 |
| commit | 15ff5db6b99786f4ba2fd3b7025c9d9592d27b35 (patch) | |
| tree | 368d97cba8f884dcdf1e843cec27d5c10f920256 /sapi/phpdbg/phpdbg_list.c | |
| parent | dd4d43c97d18781101f912b3d0d1dac36b8dc08d (diff) | |
| parent | 9f02f9fd5c1c0c28b0adc5dd48d1b195dc16e7d8 (diff) | |
| download | php-git-15ff5db6b99786f4ba2fd3b7025c9d9592d27b35.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Ref #76801 remove old file source from file_sources hash in case of file included more than once
Diffstat (limited to 'sapi/phpdbg/phpdbg_list.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_list.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/phpdbg/phpdbg_list.c b/sapi/phpdbg/phpdbg_list.c index d55e76e7b4..b48c1d4419 100644 --- a/sapi/phpdbg/phpdbg_list.c +++ b/sapi/phpdbg/phpdbg_list.c @@ -273,6 +273,7 @@ zend_op_array *phpdbg_compile_file(zend_file_handle *file, int type) { dataptr = erealloc(dataptr, sizeof(phpdbg_file_source) + sizeof(uint32_t) * line); dataptr->line[line] = endptr - data.buf; + zend_hash_del(&PHPDBG_G(file_sources), ret->filename); zend_hash_add_ptr(&PHPDBG_G(file_sources), ret->filename, dataptr); phpdbg_resolve_pending_file_break(ZSTR_VAL(ret->filename)); |