Fix GH-9710: phpdbg memory leaks by option "-h"

nielsdos · Girgias · commit 8ff2b6abb2cd · 2023-01-08T16:07:00.000Z
Closes GH-10237 Signed-off-by: George Peter Banyard <girgias@php.net>
diff --git a/NEWS b/NEWS
@@ -33,6 +33,7 @@ PHP                                                                        NEWS
 - PHPDBG:
   . Fix undefined behaviour in phpdbg_load_module_or_extension(). (nielsdos)
   . Fix NULL pointer dereference in phpdbg_create_conditional_breal(). (nielsdos)
+  . Fix GH-9710: phpdbg memory leaks by option "-h" (nielsdos)
 
 - Posix:
   . Fix memory leak in posix_ttyname() (girgias)
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
@@ -1414,6 +1414,8 @@ int main(int argc, char **argv) /* {{{ */
 					get_zend_version()
 				);
 			}
+			PHPDBG_G(flags) |= PHPDBG_IS_QUITTING;
+			php_module_shutdown();
 			sapi_deactivate();
 			sapi_shutdown();
 			if (ini_entries) {

Original file line number	Diff line number	Diff line change
`@@ -1414,6 +1414,8 @@ int main(int argc, char *argv) / {{{ */`
`1414`	`1414`	`get_zend_version()`
`1415`	`1415`	`);`
`1416`	`1416`	`}`
	`1417`	`+ PHPDBG_G(flags) \|= PHPDBG_IS_QUITTING;`
	`1418`	`+ php_module_shutdown();`
`1417`	`1419`	`sapi_deactivate();`
`1418`	`1420`	`sapi_shutdown();`
`1419`	`1421`	`if (ini_entries) {`