Kaydet (Commit) d0991ab9 authored tarafından Damjan Jovanovic's avatar Damjan Jovanovic

#i126360# Possible exception/segfault in jurt jpipe.dll under Windows with pipe connection

- Remove the LoadLibrary from DLLMain (from windows not recommended)
see http://msdn.microsoft.com/en-us/library/windows/desktop/ms682583(v=vs.85).aspx
in section Remarks
- Improve the comment why we need two dll's (jpipe.dll and jpipx.dll)
- Integrate CriticalSection, init in DllMain see link
http://msdn.microsoft.com/en-us/library/windows/desktop/dn633971(v=vs.85).aspx#general_best_practices

Patch by: Juergen Funk <juergen.funk_ml at cib.de>
Review by: Damjan Jovanovic
üst a17388ff
......@@ -25,15 +25,15 @@
#include "osl/security.h"
#include <osl/pipe.h>
/* On Windows, jpipe.dll must not have dependencies on any other URE DLLs, as
Java System.LoadLibrary could otherwise not load it. Therefore, on Windows,
this code goes into a jpipx.dll that the jpipe.dll wrapper loads with
LoadLibraryEx(LOAD_WITH_ALTERED_SEARCH_PATH). The function names in this
wrapped code are truncated from the long JNICALL names, as JNICALL causes
some "@N" with different numeric values for N (and probably different across
32 and 64 bit) to be added to the symbol names, which the calls to
GetProcAddress in wrapper/wrapper.c would otheriwse have to take into
account.
/* On Windows, jpipe.dll must not have static dependencies on any other URE DLLs
(sal3.dll, uwinapi.dll), as Java System.LoadLibrary could otherwise not load
it. Therefore, on Windows, this code goes into a jpipx.dll that the jpipe.dll
wrapper loads with LoadLibraryEx(LOAD_WITH_ALTERED_SEARCH_PATH).
The function names in this wrapped code are truncated from the long JNICALL
names, as JNICALL causes some "@N" with different numeric values for
N (and probably different across 32 and 64 bit) to be added to the symbol
names, which the calls to GetProcAddress in wrapper/wrapper.c would otherwise
have to take into account.
*/
/*****************************************************************************/
......
......@@ -30,27 +30,50 @@
#include "jni.h"
#include "sal/types.h"
static HMODULE module;
static FARPROC getFunction(char const * name) {
static HMODULE module = NULL;
static HINSTANCE hInstDLL = NULL;
static CRITICAL_SECTION CriticalSection;
void InitWrapper(void) {
#define MAXPATH 512
wchar_t path[MAXPATH];
DWORD size;
size = GetModuleFileNameW(hInstDLL, path, MAXPATH);
if (size == 0) {
abort();
}
path[size - 5] = L'x'; /* ...\jpipe.dll -> ...\jpipx.dll */
module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
if (module == NULL) {
abort();
}
}
static FARPROC getFunction(char const * name)
{
{
EnterCriticalSection(&CriticalSection);
if(module == NULL)
InitWrapper();
LeaveCriticalSection(&CriticalSection);
}
return GetProcAddress(module, name);
}
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
(void) lpvReserved;
if (fdwReason == DLL_PROCESS_ATTACH) {
wchar_t path[32767];
DWORD size;
size = GetModuleFileNameW(hinstDLL, path, 32767);
if (size == 0) {
return FALSE;
}
path[size - 5] = L'x'; /* ...\jpipe.dll -> ...\jpipx.dll */
module = LoadLibraryExW(path, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
if (module == NULL) {
return FALSE;
}
if (fdwReason == DLL_PROCESS_ATTACH)
{
InitializeCriticalSection(&CriticalSection);
hInstDLL = hinstDLL;
}
return TRUE;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment