Backported fix for CORE-3259: Deadlock and sefgault when processing c…

…trl-C in user code
FirebirdSQL · Nov 25, 2010 · a1ccc9d · a1ccc9d
1 parent 4177460
commit a1ccc9d
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 8 deletions.
diff --git a/src/jrd/cvt.cpp b/src/jrd/cvt.cpp
@@ -367,7 +367,7 @@ GDS_TIMESTAMP CVT_get_timestamp(const dsc* desc)
 }
 
 
-EngineCallbacks EngineCallbacks::instance;
+Firebird::GlobalPtr<EngineCallbacks> EngineCallbacks::instance;
 
 
 bool EngineCallbacks::transliterate(const dsc* from, dsc* to, CHARSET_ID& charset2)

diff --git a/src/jrd/cvt_proto.h b/src/jrd/cvt_proto.h
@@ -24,6 +24,7 @@
 #ifndef JRD_CVT_PROTO_H
 #define JRD_CVT_PROTO_H
 
+#include "../common/classes/init.h"
 #include "../common/cvt.h"
 #include "../jrd/err_proto.h"
 
@@ -44,7 +45,7 @@ namespace Jrd
 		{
 		}
 
-		EngineCallbacks()
+		EngineCallbacks(Firebird::MemoryPool&)
 			: Callbacks(ERR_post)
 		{
 		}
@@ -60,7 +61,7 @@ namespace Jrd
 		virtual void isVersion4(bool& v4);
 
 	public:
-		static EngineCallbacks instance;
+		static Firebird::GlobalPtr<EngineCallbacks> instance;
 	};
 }
 

diff --git a/src/jrd/pwd.cpp b/src/jrd/pwd.cpp
@@ -284,15 +284,33 @@ void SecurityDatabase::closeDatabase()
 void SecurityDatabase::onShutdown()
 {
 #ifndef EMBEDDED
-	MutexLockGuard guard(mutex);
+	isc_db_handle tmp = 0;
+	try {
+		MutexLockGuard guard(mutex);
 
-	if (server_shutdown)
+		if (server_shutdown)
+		{
+			return;
+		}
+
+		server_shutdown = true;
+		tmp = lookup_db;
+		lookup_db = 0;
+		closeDatabase();
+	}
+	catch (const Firebird::Exception&)
 	{
-		return;
+		if (tmp)
+		{
+			isc_detach_database(status, &tmp);
+		}
 	}
 
-	server_shutdown = true;
-	closeDatabase();
+	if (tmp)
+	{
+		isc_detach_database(status, &tmp);
+		checkStatus("isc_detach_database");
+	}
 #endif //EMBEDDED
 }