firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 00:03:03 +01:00
Code Issues

This should fix bug CORE-4753 : Firebird hangs in embed mode

Browse Source
This commit is contained in:
hvlad 2015-04-15 22:10:06 +00:00
parent 4307b08fe0
commit 840ac3504f
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jrd/isc_sync.cpp
View File

@ -2615,6 +2615,8 @@ UCHAR* ISC_map_file(ISC_STATUS* status_vector,
Arg::Gds(isc_unavailable).copyTo(status_vector);
return NULL;
}
SetHandleInformation(event_handle, HANDLE_FLAG_INHERIT, 0);
}
if (length == 0)
@ -2739,6 +2741,7 @@ UCHAR* ISC_map_file(ISC_STATUS* status_vector,
CloseHandle(file_handle);
goto retry;
}
SetHandleInformation(header_obj, HANDLE_FLAG_INHERIT, 0);
ULONG* const header_address = (ULONG*) MapViewOfFile(header_obj, FILE_MAP_WRITE, 0, 0, 0);
@ -2791,6 +2794,7 @@ UCHAR* ISC_map_file(ISC_STATUS* status_vector,
CloseHandle(file_handle);
return NULL;
}
SetHandleInformation(file_obj, HANDLE_FLAG_INHERIT, 0);
UCHAR* const address = (UCHAR*) MapViewOfFile(file_obj, FILE_MAP_WRITE, 0, 0, 0);
@ -3715,6 +3719,8 @@ static bool initializeFastMutex(FAST_MUTEX* lpMutex, LPSECURITY_ATTRIBUTES lpAtt
if (lpMutex->hEvent)
{
SetHandleInformation(lpMutex->hEvent, HANDLE_FLAG_INHERIT, 0);
if (lpName)
sprintf(sz, FAST_MUTEX_MAP_NAME, lpName);
@ -3730,6 +3736,8 @@ static bool initializeFastMutex(FAST_MUTEX* lpMutex, LPSECURITY_ATTRIBUTES lpAtt
if (lpMutex->hFileMap)
{
SetHandleInformation(lpMutex->hFileMap, HANDLE_FLAG_INHERIT, 0);
lpMutex->lpSharedInfo = (FAST_MUTEX_SHARED_SECTION*)
MapViewOfFile(lpMutex->hFileMap, FILE_MAP_WRITE, 0, 0, 0);

3
src/jrd/os/win32/isc_ipc.cpp
View File

@ -181,6 +181,9 @@ void* ISC_make_signal(bool create_flag, bool manual_reset, int process_idL, int
hEvent = CreateEvent(ISC_get_security_desc(), man_rst, FALSE, event_name);
}
if (hEvent) {
SetHandleInformation(hEvent, HANDLE_FLAG_INHERIT, 0);
}
return hEvent;
}