Introduce init_process_info helper in proc_open.c

alexdowad · alexdowad · commit 870c61daec08 · 2020-05-01T21:26:13.000+02:00
diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c
@@ -508,6 +508,11 @@ static void init_startup_info(STARTUPINFOW *si, struct php_proc_open_descriptor_
 	}
 }
 
+static void init_process_info(PROCESS_INFORMATION *pi)
+{
+	memset(&pi, 0, sizeof(pi));
+}
+
 static int convert_command_to_use_shell(wchar_t **cmdw, size_t cmdw_len)
 {
 	size_t len = sizeof(COMSPEC_NT) + sizeof(" /s /c ") + cmdw_len + 3;
@@ -963,8 +968,7 @@ PHP_FUNCTION(proc_open)
 	}
 
 	init_startup_info(&si, descriptors, ndesc);
-
-	memset(&pi, 0, sizeof(pi));
+	init_process_info(&pi);
 
 	if (suppress_errors) {
 		old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOGPFAULTERRORBOX);

Original file line number	Diff line number	Diff line change
`@@ -508,6 +508,11 @@ static void init_startup_info(STARTUPINFOW *si, struct php_proc_open_descriptor_`
`508`	`508`	`}`
`509`	`509`	`}`
`510`	`510`
	`511`	`+static void init_process_info(PROCESS_INFORMATION *pi)`
	`512`	`+{`
	`513`	`+ memset(&pi, 0, sizeof(pi));`
	`514`	`+}`
	`515`	`+`
`511`	`516`	`static int convert_command_to_use_shell(wchar_t **cmdw, size_t cmdw_len)`
`512`	`517`	`{`
`513`	`518`	`size_t len = sizeof(COMSPEC_NT) + sizeof(" /s /c ") + cmdw_len + 3;`
`@@ -963,8 +968,7 @@ PHP_FUNCTION(proc_open)`
`963`	`968`	`}`
`964`	`969`
`965`	`970`	`init_startup_info(&si, descriptors, ndesc);`
`966`		`-`
`967`		`- memset(&pi, 0, sizeof(pi));`
	`971`	`+ init_process_info(&pi);`
`968`	`972`
`969`	`973`	`if (suppress_errors) {`
`970`	`974`	`old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS\|SEM_NOGPFAULTERRORBOX);`