From 3a72edc124e7a459ee8a62ebb74b82fe38b8073e Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 24 Jul 2019 17:48:57 +0200 Subject: Cygwin: Fix the address of myself Introducing an independent Cygwin PID introduced a regression: The expectation is that the myself pinfo pointer always points to a specific address right in front of the loaded Cygwin DLL. However, the independent Cygwin PID changes broke this. To create myself at the right address requires to call init with h0 set to INVALID_HANDLE_VALUE or an existing address: void pinfo::init (pid_t n, DWORD flag, HANDLE h0) { [...] if (!h0 || myself.h) [...] else { shloc = SH_MYSELF; if (h0 == INVALID_HANDLE_VALUE) <-- !!! h0 = NULL; } The aforementioned commits changed that so h0 was always NULL, this way creating myself at an arbitrary address. This patch makes sure to set the handle to INVALID_HANDLE_VALUE again when creating a new process, so init knows that myself has to be created in the right spot. While at it, fix a potential uninitialized handle value in child_info_spawn::handle_spawn. Fixes: b5e1003722cb ("Cygwin: processes: use dedicated Cygwin PID rather than Windows PID") Fixes: 88605243a19b ("Cygwin: fix child getting another pid after spawnve") Signed-off-by: Corinna Vinschen --- winsup/cygwin/dcrt0.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'winsup/cygwin/dcrt0.cc') diff --git a/winsup/cygwin/dcrt0.cc b/winsup/cygwin/dcrt0.cc index fb726a7..86ab725 100644 --- a/winsup/cygwin/dcrt0.cc +++ b/winsup/cygwin/dcrt0.cc @@ -652,7 +652,7 @@ void child_info_spawn::handle_spawn () { extern void fixup_lockf_after_exec (bool); - HANDLE h; + HANDLE h = INVALID_HANDLE_VALUE; if (!dynamically_loaded || get_parent_handle ()) { cygheap_fixup_in_child (true); -- cgit v1.1