Changeset 70419 in vbox

Timestamp:

Jan 2, 2018 11:17:06 AM (7 years ago)

Author:

vboxsync

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

120024

Message:

iprt/direnum-r3-nt.cpp: Workaround for buggy fat driver on NT 3.1 (and possibly later). Fixed assertion.

File:

• trunk/src/VBox/Runtime/r3/nt/direnum-r3-nt.cpp (modified) (5 diffs)

trunk/src/VBox/Runtime/r3/nt/direnum-r3-nt.cpp

@@ -43 +43 @@
 #include "internal/dir.h"
 #include "internal/path.h"
+#include "../win/internal-r3-win.h"
 
 
@@ -200 +201 @@
 static int rtDirNtCheckRecord(PRTDIRINTERNAL pThis)
 {
-#ifdef RTDIR_NT_STRICT
+#if defined(RTDIR_NT_STRICT) || defined(RT_ARCH_X86)
 # ifdef IPRT_WITH_NT_PATH_PASSTHRU
     if (pThis->enmInfoClass != FileMaximumInformation)
@@ -210 +211 @@
         else
             uEndAddr = (uintptr_t)&pThis->uCurData.pBoth->FileName[0];
+
+# ifdef RT_ARCH_X86
+        /* Workaround for NT 3.1 bug where FAT returns a too short buffer length.
+           Including all NT 3.x versions in case it bug was fixed till NT 4. */
+        uintptr_t const uEndBuffer = (uintptr_t)&pThis->pabBuffer[pThis->cbBuffer];
+        if (   uEndAddr < uEndBuffer
+            && uEndAddr + pThis->uCurData.pBoth->FileNameLength <= uEndBuffer)
+        { /* likely */ }
+        else if (   (   g_enmWinVer == kRTWinOSType_NT310
+                     || g_enmWinVer == kRTWinOSType_NT350 // not sure when it was fixed...
+                     || g_enmWinVer == kRTWinOSType_NT351)
+                 && pThis->enmInfoClass == FileBothDirectoryInformation)
+        {
+            size_t cbLeft = (uintptr_t)&pThis->pabBuffer[pThis->cbBufferAlloc] - (uintptr_t)pThis->uCurData.pBoth;
+            if (   cbLeft >= RT_UOFFSETOF(FILE_BOTH_DIR_INFORMATION, FileName)
+                && pThis->uCurData.pBoth->FileNameLength > 0
+                && cbLeft >= RT_UOFFSETOF(FILE_BOTH_DIR_INFORMATION, FileName) + pThis->uCurData.pBoth->FileNameLength)
+            {
+                pThis->cbBuffer = ((uintptr_t)&pThis->uCurData.pBoth->FileName[0] + pThis->uCurData.pBoth->FileNameLength)
+                                - (uintptr_t)&pThis->pabBuffer[0];
+            }
+        }
+# endif
+
+# ifdef RTDIR_NT_STRICT
         AssertReturn(uEndAddr < (uintptr_t)&pThis->pabBuffer[pThis->cbBuffer], VERR_IO_GEN_FAILURE);
-
         AssertReturn(pThis->uCurData.pBoth->FileNameLength < _64K, VERR_FILENAME_TOO_LONG);
         AssertReturn((pThis->uCurData.pBoth->FileNameLength & 1) == 0, VERR_IO_GEN_FAILURE);
@@ -220 +245 @@
         AssertReturn((unsigned)pThis->uCurData.pBoth->ShortNameLength <= sizeof(pThis->uCurData.pBoth->ShortName),
                      VERR_IO_GEN_FAILURE);
+# endif
     }
 #else
@@ -472 +498 @@
         return RTErrConvertFromNtStatus(rcNt);
     }
-    Assert(Ios.Information > sizeof(*pThis->uCurData.pBoth));
+    AssertMsg(  Ios.Information
+              > (pThis->enmInfoClass == FileMaximumInformation ? sizeof(*pThis->uCurData.pObjDir) : sizeof(*pThis->uCurData.pBoth)),
+              ("Ios.Information=%#x\n", Ios.Information));
 
     /*