Changeset 6991 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Feb 18, 2008 1:19:02 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

28186

Message:

r=bird: Close the file on failure.

File:

• trunk/src/VBox/Runtime/r3/win/fileio-win.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/r3/win/fileio-win.cpp

@@ -108 +108 @@
      * If it fails with a seek error it's because we hit the file system limit.
      */
-/** @todo r=bird: I'd be very interested to know on which versions of windows and on which file systems 
- * this supposedly works. The fastfat sources in the latest WDK makes no limit checks during 
+/** @todo r=bird: I'd be very interested to know on which versions of windows and on which file systems
+ * this supposedly works. The fastfat sources in the latest WDK makes no limit checks during
  * file seeking, only at the time of writing (and some other odd ones we cannot make use of). */
     uint64_t offCurrent;
@@ -235 +235 @@
     if (fOpen & RTFILE_O_NOT_CONTENT_INDEXED)
     {
-        if (FALSE == SetFileAttributes(pszFilename, FILE_ATTRIBUTE_NOT_CONTENT_INDEXED))
-            return RTErrConvertFromWin32(GetLastError());
+        if (!SetFileAttributes(pszFilename, FILE_ATTRIBUTE_NOT_CONTENT_INDEXED))
+        {
+            rc = RTErrConvertFromWin32(GetLastError());
+            CloseHandle(hFile);
+            return rc;
+        }
     }
 #else
@@ -264 +268 @@
     if (fOpen & RTFILE_O_NOT_CONTENT_INDEXED)
     {
-        if (FALSE == SetFileAttributesW(pwszFilename, FILE_ATTRIBUTE_NOT_CONTENT_INDEXED))
+        if (!SetFileAttributesW(pwszFilename, FILE_ATTRIBUTE_NOT_CONTENT_INDEXED))
         {
             rc = RTErrConvertFromWin32(GetLastError());
+            CloseHandle(hFile);
             RTUtf16Free(pwszFilename);
             return rc;