Fixed bug CORE-4753 : Firebird hangs in embed mode.

Removed annoying wrong assertion.
FirebirdSQL · Apr 21, 2015 · 67383e1 · 67383e1
1 parent e0a4131
commit 67383e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/common/isc_sync.cpp b/src/common/isc_sync.cpp
@@ -2184,6 +2184,8 @@ SharedMemoryBase::SharedMemoryBase(const TEXT* filename, ULONG length, IpcObject
 			CloseHandle(file_handle);
 			Arg::Gds(isc_unavailable).raise();
 		}
+
+		SetHandleInformation(event_handle, HANDLE_FLAG_INHERIT, 0);
 	}
 
 	if (length == 0)
@@ -2303,6 +2305,7 @@ SharedMemoryBase::SharedMemoryBase(const TEXT* filename, ULONG length, IpcObject
 		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);
 
@@ -2354,6 +2357,7 @@ SharedMemoryBase::SharedMemoryBase(const TEXT* filename, ULONG length, IpcObject
 		CloseHandle(file_handle);
 		system_call_failed::raise("CreateFileMapping", err);
 	}
+	SetHandleInformation(file_obj, HANDLE_FLAG_INHERIT, 0);
 
 	UCHAR* const address = (UCHAR*) MapViewOfFile(file_obj, FILE_MAP_WRITE, 0, 0, 0);
 
@@ -2814,6 +2818,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);
 
@@ -2829,6 +2835,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);
 

diff --git a/src/common/os/win32/isc_ipc.cpp b/src/common/os/win32/isc_ipc.cpp
@@ -176,7 +176,7 @@ int ISC_kill(SLONG pid, SLONG signal_number, void *object_hndl)
 	return SetEvent(handle) ? 0 : -1;
 }
 
-void* ISC_make_signal(bool create_flag, bool manual_reset, int process_idL, int signal_number)
+void* ISC_make_signal(bool /*create_flag*/, bool manual_reset, int process_idL, int signal_number)
 {
 /**************************************
  *
@@ -206,14 +206,11 @@ void* ISC_make_signal(bool create_flag, bool manual_reset, int process_idL, int
 		return NULL;
 	}
 
-	HANDLE hEvent = OpenEvent(EVENT_ALL_ACCESS, TRUE, event_name);
+	HANDLE hEvent = CreateEvent(ISC_get_security_desc(), man_rst, FALSE, event_name);
 
-	if (create_flag)
-	{
-		fb_assert(!hEvent);
-		hEvent = CreateEvent(ISC_get_security_desc(), man_rst, FALSE, event_name);
+	if (hEvent) {
+		SetHandleInformation(hEvent, HANDLE_FLAG_INHERIT, 0);
 	}
-
 	return hEvent;
 }