bug 325902 - win32 loadLibrary & cwd

1 files changed, 21 insertions, 0 deletions

diff --git a/bundles/org.eclipse.equinox.executable/library/eclipse.c b/bundles/org.eclipse.equinox.executable/library/eclipse.c
index a657d643a..470900721 100644
--- a/bundles/org.eclipse.equinox.executable/library/eclipse.c
+++ b/bundles/org.eclipse.equinox.executable/library/eclipse.c
@@ -346,6 +346,7 @@ static const _TCHAR* getVMArch();
 
 #ifdef _WIN32
 static void     createConsole();
+static void		fixDLLSearchPath();
 static int 		isConsoleLauncher();
 #endif
 static int      consoleLauncher = 0;
@@ -406,6 +407,9 @@ JNIEXPORT int run(int argc, _TCHAR* argv[], _TCHAR* vmArgs[])
 #elif _WIN32
     /* this must be before doing any console stuff, platforms other than win32 leave this set to 0 */
     consoleLauncher = isConsoleLauncher();
+    
+    /*fix the DLL search path for security */
+    fixDLLSearchPath();
 #endif
     
     /* Find the directory where the Eclipse program is installed. */
@@ -1315,6 +1319,23 @@ static int isConsoleLauncher() {
 	}
 	return 0;
 }
+
+static void fixDLLSearchPath() {
+#ifdef UNICODE
+	_TCHAR* functionName = _T_ECLIPSE("SetDllDirectoryW");
+#else
+	_TCHAR* functionName = _T_ECLIPSE("SetDllDirectoryA");
+#endif
+
+	BOOL (WINAPI *SetDLLDirectory)(LPCTSTR);
+	void * handle = loadLibrary(_T_ECLIPSE("Kernel32.dll"));
+	if (handle != NULL) {
+		if ( (SetDLLDirectory = findSymbol(handle, functionName)) != NULL) {
+			SetDLLDirectory(_T_ECLIPSE(""));
+		}
+	}
+}
+
 #endif
 
 /* Set the vm to use based on the given .ee file.