mirror of
git://sourceware.org/git/newlib-cygwin.git
synced 2025-02-18 15:09:32 +08:00
Cygwin: cwd: avoid releasing the cwdstuff SRW Lock twice
cwdstuff::set has a code snippet handling the case where a process can't create a handle to a directory, e. g., due to permissions. Commit 88443b0a22589 ("cwdstuff: Don't leave from setting the CWD prematurely on init") introduced a special case to handle this situation at process initialization. It also introduces an early mutex release, which is not required, but ok, because we're in the init phase. Releasing the mutex twice is no problem since the mutexes are recursive. Fast forward to commit 0819679a7a210 ("Cygwin: cwd: use SRWLOCK instead of muto"). The mechanical change from a recursive mutex to a non-recursive SRWLOCK failed to notice that this very specific situation will release the SRWLOCK twice. Remove the superfluous release action. While at it, don't set dir to NULL, but h, since dir will get the value of h anyway later on. Setting h to NULL may not be necessary, but better safe than sorry. Reported-by: tryandbuy >tryandbuy@proton.me> Fixes: 88443b0a22589 ("cwdstuff: Don't leave from setting the CWD prematurely on init") Fixes: 0819679a7a210 ("Cygwin: cwd: use SRWLOCK instead of muto") Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
parent
d56d58ace2
commit
60d1eeac6c
@ -4868,10 +4868,9 @@ cwdstuff::set (path_conv *nat_cwd, const char *posix_cwd)
|
||||
peb.ProcessParameters->CurrentDirectoryHandle,
|
||||
GetCurrentProcess (), &h, 0, TRUE, 0))
|
||||
{
|
||||
release_write ();
|
||||
if (peb.ProcessParameters->CurrentDirectoryHandle)
|
||||
debug_printf ("...and DuplicateHandle failed with %E.");
|
||||
dir = NULL;
|
||||
h = NULL;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -3,3 +3,6 @@ Bug Fixes
|
||||
|
||||
- Fix missing term in __cpuset_zero_s() prototoype in sys/cpuset.h.
|
||||
Addresses: https://cygwin.com/pipermail/cygwin/2023-September/254423.html
|
||||
|
||||
- Fix hang in process initialization if cwd is unreadable.
|
||||
Addresses: https://cygwin.com/pipermail/cygwin/2023-October/254604.html
|
||||
|
Loading…
x
Reference in New Issue
Block a user