diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-16 11:11:00 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-07-16 11:11:00 +0200 |
| commit | ebfa05677ba9d226ec4490b788ffafe4ca100770 (patch) | |
| tree | 50da017e78168a10bcbc0a50c37ba64ded54f124 | |
| parent | a91fb18da4c1d7d1d8366a913b8114d151029bf3 (diff) | |
| parent | eea9d617636c69d265b698088777469fdd65862d (diff) | |
| download | php-git-ebfa05677ba9d226ec4490b788ffafe4ca100770.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
| -rw-r--r-- | sapi/phpdbg/phpdbg_list.c | 1 | ||||
| -rw-r--r-- | sapi/phpdbg/tests/bug78297.phpt | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/sapi/phpdbg/phpdbg_list.c b/sapi/phpdbg/phpdbg_list.c index 35b023aebe..03b4c3526e 100644 --- a/sapi/phpdbg/phpdbg_list.c +++ b/sapi/phpdbg/phpdbg_list.c @@ -248,6 +248,7 @@ zend_op_array *phpdbg_compile_file(zend_file_handle *file, int type) { } else { zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file->filename); } + return NULL; } data.buf = estrndup(bufptr, len); diff --git a/sapi/phpdbg/tests/bug78297.phpt b/sapi/phpdbg/tests/bug78297.phpt new file mode 100644 index 0000000000..47b13ad605 --- /dev/null +++ b/sapi/phpdbg/tests/bug78297.phpt @@ -0,0 +1,16 @@ +--TEST-- +Bug #78297: Include unexistent file memory leak +--PHPDBG-- +r +q +--FILE-- +<?php +include "does_not_exist.php"; +--EXPECTF-- +[Successful compilation of %s] +prompt> +Warning: include(%s): failed to open stream: No such file or directory in %s on line %d + +Warning: include(): Failed opening 'does_not_exist.php' for inclusion (include_path=%s) in %s on line %d +[Script ended normally] +prompt> |