Changeset 46561 in vbox for trunk/src

Timestamp:

Jun 14, 2013 1:39:16 PM (12 years ago)

Author:

vboxsync

Message:

Runtime/r3/win: rtldrNative restriction

File:

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

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

@@ -36 +36 @@
 #include <iprt/err.h>
 #include <iprt/alloca.h>
+#include <iprt/once.h>
 #include <iprt/string.h>
 #include "internal/ldr.h"
 
+static RTONCE g_Once = RTONCE_INITIALIZER;
+
+static DECLCALLBACK(int) rtldrOnceSetDllDirectory(void *pvUser)
+{
+    HMODULE hmod = GetModuleHandle(TEXT("kernel32.dll"));
+    if (hmod)
+    {
+        typedef BOOLEAN (WINAPI *PFNSETDLLDIRECTORY)(LPCWSTR);
+        PFNSETDLLDIRECTORY pfn = (PFNSETDLLDIRECTORY)GetProcAddress(hmod, "SetDllDirectoryW");
+        if (pfn)
+        {
+            BOOL fOk = pfn(L"");
+            if (!fOk)
+                return RTErrConvertFromWin32(GetLastError());
+        }
+    }
+    return VINF_SUCCESS;
+}
 
 int rtldrNativeLoad(const char *pszFilename, uintptr_t *phHandle, uint32_t fFlags, PRTERRINFO pErrInfo)
@@ -60 +79 @@
 
     /*
+     * Don't allow loading DLLs from the current directory.
+     */
+#if 0
+    int rc = RTOnce(&g_Once, rtldrOnceSetDllDirectory, NULL);
+    if (RT_FAILURE(rc))
+        return rc;
+#else
+    int rc = VINF_SUCCESS;
+#endif
+
+    /*
      * Attempt load.
      */
@@ -73 +103 @@
      */
     DWORD dwErr = GetLastError();
-    int   rc    = RTErrConvertFromWin32(dwErr);
+    rc = RTErrConvertFromWin32(dwErr);
     return RTErrInfoSetF(pErrInfo, rc, "GetLastError=%u", dwErr);
 }