diff options
| author | Nikita Popov <nikic@php.net> | 2016-12-14 18:11:43 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-12-14 18:11:43 +0100 |
| commit | 33e96c9d632ca4ce222c7d9a78d835ad45b54010 (patch) | |
| tree | da8e8b53d45559ebeac581dba251c66cd9b71b2f /sapi/phpdbg/phpdbg.c | |
| parent | 2f438342ecef4efd207becddf9cea46d0d3a2f00 (diff) | |
| parent | f99bf7036033f4dd95b8f56c8697af7f8963ab9f (diff) | |
| download | php-git-33e96c9d632ca4ce222c7d9a78d835ad45b54010.tar.gz | |
Merge branch 'PHP-7.0' into 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 dc7422fcae..588294c227 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); } } /* }}} */ |