[newlib-cygwin] Cygwin: try_to_bin: fix rootdir handle after reopening

Corinna Vinschen corinna@sourceware.org
Wed Jan 9 20:49:00 GMT 2019


commit b7a6d357ee23d690a6559235600b85801d6ad025
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Wed Jan 9 21:41:48 2019 +0100

    Cygwin: try_to_bin: fix rootdir handle after reopening
    If the first rename fails, we reopen the rootdir for creating a subdir.
    The rootdir handle can change its value at this point, but the code
    doesn't take this into account.  The subsequent rename then fails with
    STATUS_INVALID_HANDLE.  Fix this by copying the new rootdir value to
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

 winsup/cygwin/syscalls.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 4f91f4b..728a6b1 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -389,6 +389,8 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags)
 	  		&recycler, status);
 	  goto out;
+      /* Correct the rootdir HANDLE in pfri after reopening the dir. */
+      pfri->RootDirectory = rootdir;
       /* Then check if recycler exists by opening and potentially creating it.
 	 Yes, we can really do that.  Typically the recycle bin is created
 	 by the first user actually using the bin. */

More information about the Cygwin-cvs mailing list