diff options
| author | Nikita Popov <nikic@php.net> | 2016-12-14 18:11:51 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-12-14 18:11:51 +0100 |
| commit | ef1ed6ab8eeedff5a511e027ac97a98a88fca47f (patch) | |
| tree | 7b02ae7b529276860da08bcdd5137c30f5a374f6 /sapi/phpdbg/phpdbg.c | |
| parent | 61e7e7c5bd975cffd9e317d92d58ce02ff11d0c2 (diff) | |
| parent | 33e96c9d632ca4ce222c7d9a78d835ad45b54010 (diff) | |
| download | php-git-ef1ed6ab8eeedff5a511e027ac97a98a88fca47f.tar.gz | |
Merge branch 'PHP-7.1'
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 657667638c..34545367cb 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1331,7 +1331,7 @@ void phpdbg_free_wrapper(void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) /* {{ */ } else { phpdbg_watch_efree(p); - return _zend_mm_free(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); + _zend_mm_free(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); } } /* }}} */ |