security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-24 16:43:28 +02:00
Code Activity

w32: Fix spawn functions to support Windows Xp.

Browse Source 
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2023-05-03 09:18:56 +09:00
parent b9e65faa5d
commit 768d365b0f
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
1 changed files with 67 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
common/exechelp-w32.c
View File

@ -452,6 +452,30 @@ post_syscall (void)
} }
/*
* Check if STARTUPINFOEXW supports PROC_THREAD_ATTRIBUTE_HANDLE_LIST.
*/
static int
check_windows_version (void)
{
static int is_vista_or_later = -1;
OSVERSIONINFO osvi;
if (is_vista_or_later == -1)
{
memset (&osvi,0,sizeof(osvi));
osvi.dwOSVersionInfoSize = sizeof(osvi);
GetVersionEx (&osvi);
/* The feature is available on Vista or later. */
is_vista_or_later = (osvi.dwMajorVersion >= 6);
}
return is_vista_or_later;
}
static gpg_err_code_t static gpg_err_code_t
spawn_detached (const char *pgmname, char *cmdline, spawn_detached (const char *pgmname, char *cmdline,
void (*spawn_cb) (struct spawn_cb_arg *), void *spawn_cb_arg) void (*spawn_cb) (struct spawn_cb_arg *), void *spawn_cb_arg)
@ -506,18 +530,22 @@ spawn_detached (const char *pgmname, char *cmdline,
if (j) if (j)
{ {
InitializeProcThreadAttributeList (NULL, 1, 0, &attr_list_size); if (check_windows_version ())
si.lpAttributeList = xtrymalloc (attr_list_size);
if (si.lpAttributeList == NULL)
{ {
xfree (cmdline); InitializeProcThreadAttributeList (NULL, 1, 0, &attr_list_size);
return gpg_err_code_from_syserror (); si.lpAttributeList = xtrymalloc (attr_list_size);
if (si.lpAttributeList == NULL)
{
xfree (cmdline);
return gpg_err_code_from_syserror ();
}
InitializeProcThreadAttributeList (si.lpAttributeList, 1, 0,
&attr_list_size);
UpdateProcThreadAttribute (si.lpAttributeList, 0,
PROC_THREAD_ATTRIBUTE_HANDLE_LIST,
hd, sizeof (HANDLE) * j, NULL, NULL);
} }
InitializeProcThreadAttributeList (si.lpAttributeList, 1, 0,
&attr_list_size);
UpdateProcThreadAttribute (si.lpAttributeList, 0,
PROC_THREAD_ATTRIBUTE_HANDLE_LIST,
hd, sizeof (HANDLE) * j, NULL, NULL);
ask_inherit = TRUE; ask_inherit = TRUE;
} }
} }
@ -784,34 +812,37 @@ gnupg_process_spawn (const char *pgmname, const char *argv[],
if (j) if (j)
{ {
InitializeProcThreadAttributeList (NULL, 1, 0, &attr_list_size); if (check_windows_version ())
si.lpAttributeList = xtrymalloc (attr_list_size);
if (si.lpAttributeList == NULL)
{ {
if ((flags & GNUPG_PROCESS_STDIN_PIPE) InitializeProcThreadAttributeList (NULL, 1, 0, &attr_list_size);
|| !(flags & GNUPG_PROCESS_STDIN_KEEP)) si.lpAttributeList = xtrymalloc (attr_list_size);
CloseHandle (hd_in[0]); if (si.lpAttributeList == NULL)
if ((flags & GNUPG_PROCESS_STDIN_PIPE)) {
CloseHandle (hd_in[1]); if ((flags & GNUPG_PROCESS_STDIN_PIPE)
if ((flags & GNUPG_PROCESS_STDOUT_PIPE)) || !(flags & GNUPG_PROCESS_STDIN_KEEP))
CloseHandle (hd_out[0]); CloseHandle (hd_in[0]);
if ((flags & GNUPG_PROCESS_STDOUT_PIPE) if ((flags & GNUPG_PROCESS_STDIN_PIPE))
|| !(flags & GNUPG_PROCESS_STDOUT_KEEP)) CloseHandle (hd_in[1]);
CloseHandle (hd_out[1]); if ((flags & GNUPG_PROCESS_STDOUT_PIPE))
if ((flags & GNUPG_PROCESS_STDERR_PIPE)) CloseHandle (hd_out[0]);
CloseHandle (hd_err[0]); if ((flags & GNUPG_PROCESS_STDOUT_PIPE)
if ((flags & GNUPG_PROCESS_STDERR_PIPE) || !(flags & GNUPG_PROCESS_STDOUT_KEEP))
|| !(flags & GNUPG_PROCESS_STDERR_KEEP)) CloseHandle (hd_out[1]);
CloseHandle (hd_err[1]); if ((flags & GNUPG_PROCESS_STDERR_PIPE))
xfree (process); CloseHandle (hd_err[0]);
xfree (cmdline); if ((flags & GNUPG_PROCESS_STDERR_PIPE)
return gpg_err_code_from_syserror (); || !(flags & GNUPG_PROCESS_STDERR_KEEP))
CloseHandle (hd_err[1]);
xfree (process);
xfree (cmdline);
return gpg_err_code_from_syserror ();
}
InitializeProcThreadAttributeList (si.lpAttributeList, 1, 0,
&attr_list_size);
UpdateProcThreadAttribute (si.lpAttributeList, 0,
PROC_THREAD_ATTRIBUTE_HANDLE_LIST,
hd, sizeof (HANDLE) * j, NULL, NULL);
} }
InitializeProcThreadAttributeList (si.lpAttributeList, 1, 0,
&attr_list_size);
UpdateProcThreadAttribute (si.lpAttributeList, 0,
PROC_THREAD_ATTRIBUTE_HANDLE_LIST,
hd, sizeof (HANDLE) * j, NULL, NULL);
ask_inherit = TRUE; ask_inherit = TRUE;
} }
} }