msvcrt: Use fd critical section in msvcrt_free_fd.

b052afd4 · Piotr Caban · Alexandre Julliard · c7b0fb51 · b052afd4
Commit b052afd4 authored Jun 03, 2015 by Piotr Caban Committed by Alexandre Julliard Jun 03, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

file.c dlls/msvcrt/file.c +3 -3

No files found.
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -332,10 +332,8 @@ static HANDLE msvcrt_fdtoh(int fd)
 /* INTERNAL: free a file entry fd */
 static void msvcrt_free_fd(int fd)
 {
-  ioinfo *fdinfo;
+  ioinfo *fdinfo = get_ioinfo(fd);

-  LOCK_FILES();
-  fdinfo = get_ioinfo_nolock(fd);
  if(fdinfo != &MSVCRT___badioinfo)
  {
    fdinfo->handle = INVALID_HANDLE_VALUE;
@@ -358,7 +356,9 @@ static void msvcrt_free_fd(int fd)
        break;
    }
  }
+  release_ioinfo(fdinfo);

+  LOCK_FILES();
  if (fd == MSVCRT_fdend - 1)
    MSVCRT_fdend--;
  if (fd < MSVCRT_fdstart)