Fixed bug #78297

nikic · cmb69 · commit f3e71b3b730e · 2019-07-16T13:35:46.000+02:00
(cherry picked from commit 8a19fe2)
diff --git a/NEWS b/NEWS
@@ -1,5 +1,10 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+?? ??? ????, PHP 7.3.8
+
+- Phpdbg:
+  . Fixed bug #78297 (Include unexistent file memory leak). (Nikita)
+
 18 Jul 2019, PHP 7.3.8RC1
 
 - Core:
diff --git 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
@@ -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>

Original file line number	Diff line number	Diff line change
`@@ -248,6 +248,7 @@ zend_op_array phpdbg_compile_file(zend_file_handle file, int type) {`
`248`	`248`	`} else {`
`249`	`249`	`zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file->filename);`
`250`	`250`	`}`
	`251`	`+ return NULL;`
`251`	`252`	`}`
`252`	`253`
`253`	`254`	`data.buf = estrndup(bufptr, len);`