Fixed bug CORE-2586 : Make all kernel object names in the same namespace

src/common/utils.cpp

@@ -326,7 +326,6 @@ char* cleanup_passwd(char* arg)
 #ifdef WIN_NT
 
 static bool validateProductSuite (LPCSTR lpszSuiteToValidate);
-static bool isGlobalKernelPrefix();
 
 // hvlad: begins from Windows 2000 we can safely add 'Global\' prefix for
 // names of all kernel objects we use. For Win9x we must not add this prefix.

src/common/utils_proto.h

@@ -97,6 +97,7 @@ namespace fb_utils
 
 #ifdef WIN_NT
 	bool prefix_kernel_object_name(char* name, size_t bufsize);
+	bool isGlobalKernelPrefix();
 #endif
 
 	Firebird::PathName get_process_name();

src/jrd/isc_sync.cpp

@@ -2389,7 +2389,7 @@ UCHAR* ISC_map_file(ISC_STATUS* status_vector,
 
 	DWORD fdw_create;
 	if (init_flag && file_exists && trunc_flag)
-		fdw_create = TRUNCATE_EXISTING | OPEN_ALWAYS;
+		fdw_create = TRUNCATE_EXISTING;
 	else
 		fdw_create = OPEN_ALWAYS;
 
@@ -2467,13 +2467,23 @@ UCHAR* ISC_map_file(ISC_STATUS* status_vector,
 /* Create the real file mapping object. */
 
 	TEXT mapping_name[MAXPATHLEN + 15]; // enough for int32 as text
-	sprintf(mapping_name, "%s_mapping_%"ULONGFORMAT, filename, header_address[1]);
+	sprintf(mapping_name, "_mapping_%"ULONGFORMAT, header_address[1]);
+
+	if (!make_object_name(object_name, sizeof(object_name), filename, mapping_name))
+	{
+		error(status_vector, "make_object_name", GetLastError());
+		UnmapViewOfFile(header_address);
+		CloseHandle(header_obj);
+		CloseHandle(event_handle);
+		CloseHandle(file_handle);
+		return NULL;
+	}
 
 	HANDLE file_obj = CreateFileMapping(file_handle,
 										ISC_get_security_desc(),
 										PAGE_READWRITE,
 										0, length,
-										mapping_name);
+										object_name);
 	if (file_obj == NULL)
 	{
 		error(status_vector, "CreateFileMapping", GetLastError());
@@ -3521,24 +3531,28 @@ UCHAR* ISC_remap_file(ISC_STATUS * status_vector,
  * is generated with the mapped file is created.
  */
 
-	HANDLE file_obj;
+	HANDLE file_obj = NULL;
 
 	while (true)
 	{
-		TEXT mapping_name[MAXPATHLEN + 15]; // enough for int32 as text
+		TEXT mapping_name[64]; // enough for int32 as text
-		sprintf(mapping_name, "%s_mapping_%"ULONGFORMAT,
+		sprintf(mapping_name, "_mapping_%"ULONGFORMAT, shmem_data->sh_mem_hdr_address[1] + 1);
-				shmem_data->sh_mem_name, shmem_data->sh_mem_hdr_address[1] + 1);
+
+		TEXT object_name[MAXPATHLEN];
+		if (!make_object_name(object_name, sizeof(object_name), shmem_data->sh_mem_name, mapping_name))
+			break;
 
 		file_obj = CreateFileMapping(shmem_data->sh_mem_handle,
 									 ISC_get_security_desc(),
 									 PAGE_READWRITE,
 									 0, new_length,
-									 mapping_name);
+									 object_name);
 
 		if (!((GetLastError() == ERROR_ALREADY_EXISTS) && flag))
 			break;
 
 		CloseHandle(file_obj);
+		file_obj = NULL;
 		shmem_data->sh_mem_hdr_address[1]++;
 	}
 

src/jrd/os/win32/isc_ipc.cpp

@@ -39,6 +39,7 @@
 
 #include "firebird.h"
 #include "../../../common/classes/init.h"
+#include "../../../common/utils_proto.h"
 #include "../jrd/common.h"
 #include "gen/iberror.h"
 #include "../jrd/isc.h"
@@ -159,7 +160,7 @@ void* ISC_make_signal(bool create_flag, bool manual_reset, int process_idL, int
  **************************************/
 	ISC_signal_init();
 
-	const BOOLEAN man_rst = manual_reset ? TRUE : FALSE;
+	const BOOL man_rst = manual_reset ? TRUE : FALSE;
 
 	if (!signal_number)
 		return CreateEvent(NULL, man_rst, FALSE, NULL);
@@ -167,6 +168,12 @@ void* ISC_make_signal(bool create_flag, bool manual_reset, int process_idL, int
 	TEXT event_name[BUFFER_TINY];
 	sprintf(event_name, "_firebird_process%u_signal%d", process_idL, signal_number);
 
+	if (!fb_utils::prefix_kernel_object_name(event_name, sizeof(event_name)))
+	{
+		SetLastError(ERROR_FILENAME_EXCED_RANGE);
+		return NULL;
+	}
+
 	HANDLE hEvent = OpenEvent(EVENT_ALL_ACCESS, TRUE, event_name);
 
 	if (create_flag) {