Fixed CORE-6433: Several firebird servers crash

AlexPeshkoff · AlexPeshkoff · commit 2e092bf45b31 · 2020-11-02T13:34:29.000+03:00
diff --git a/src/jrd/Attachment.cpp b/src/jrd/Attachment.cpp
@@ -52,7 +52,7 @@ using namespace Firebird;
 
 
 // static method
-Jrd::Attachment* Jrd::Attachment::create(Database* dbb, Firebird::IProvider* provider)
+Jrd::Attachment* Jrd::Attachment::create(Database* dbb, JProvider* provider)
 {
 	MemoryPool* const pool = dbb->createPool();
 
@@ -171,7 +171,7 @@ void Jrd::Attachment::backupStateReadUnLock(thread_db* tdbb)
 }
 
 
-Jrd::Attachment::Attachment(MemoryPool* pool, Database* dbb, IProvider* provider)
+Jrd::Attachment::Attachment(MemoryPool* pool, Database* dbb, JProvider* provider)
 	: att_pool(pool),
 	  att_memory_stats(&dbb->dbb_memory_stats),
 	  att_database(dbb),
diff --git a/src/jrd/Attachment.h b/src/jrd/Attachment.h
@@ -228,7 +228,7 @@ class Attachment : public pool_alloc<type_att>
 	};
 
 public:
-	static Attachment* create(Database* dbb, Firebird::IProvider* provider);
+	static Attachment* create(Database* dbb, JProvider* provider);
 	static void destroy(Attachment* const attachment);
 
 	MemoryPool* const att_pool;					// Memory pool
@@ -384,17 +384,17 @@ class Attachment : public pool_alloc<type_att>
 
 	JAttachment* getInterface() throw();
 
-	Firebird::IProvider* getProvider()
+	JProvider* getProvider()
 	{
 		fb_assert(att_provider);
 		return att_provider;
 	}
 
 private:
-	Attachment(MemoryPool* pool, Database* dbb, Firebird::IProvider* provider);
+	Attachment(MemoryPool* pool, Database* dbb, JProvider* provider);
 	~Attachment();
 
-	Firebird::IProvider* att_provider;	// Provider which created this attachment
+	JProvider* att_provider;	// Provider which created this attachment
 };
 
 
diff --git a/src/jrd/extds/InternalDS.cpp b/src/jrd/extds/InternalDS.cpp
@@ -167,9 +167,7 @@ void InternalConnection::attach(thread_db* tdbb, const PathName& dbName,
 		FbLocalStatus status;
 		{
 			EngineCallbackGuard guard(tdbb, *this, FB_FUNCTION);
-			AutoPlugin<JProvider> jInstance(JProvider::getInstance());
-			jInstance->setDbCryptCallback(&status, tdbb->getAttachment()->att_crypt_callback);
-			m_attachment.assignRefNoIncr(jInstance->attachDatabase(&status, m_dbName.c_str(),
+			m_attachment.assignRefNoIncr(attachment->getProvider()->attachDatabase(&status, m_dbName.c_str(),
 				newDpb.getBufferLength(), newDpb.getBuffer()));
 		}
 
diff --git a/src/jrd/jrd.cpp b/src/jrd/jrd.cpp
@@ -1056,7 +1056,7 @@ static void		unwindAttach(thread_db* tdbb, const Exception& ex, FbStatusVector*
 	Jrd::Attachment* attachment, Database* dbb, bool internalFlag);
 static JAttachment*	initAttachment(thread_db*, const PathName&, const PathName&, RefPtr<const Config>, bool,
 	const DatabaseOptions&, RefMutexUnlock&, IPluginConfig*, JProvider*);
-static JAttachment*	create_attachment(const PathName&, Database*, IProvider* provider, const DatabaseOptions&, bool newDb);
+static JAttachment*	create_attachment(const PathName&, Database*, JProvider* provider, const DatabaseOptions&, bool newDb);
 static void		prepare_tra(thread_db*, jrd_tra*, USHORT, const UCHAR*);
 static void		start_transaction(thread_db* tdbb, bool transliterate, jrd_tra** tra_handle,
 	Jrd::Attachment* attachment, unsigned int tpb_length, const UCHAR* tpb);
@@ -6217,7 +6217,7 @@ static JAttachment* initAttachment(thread_db* tdbb, const PathName& expanded_nam
 
 static JAttachment* create_attachment(const PathName& alias_name,
 									  Database* dbb,
-									  IProvider* provider,
+									  JProvider* provider,
 									  const DatabaseOptions& options,
 									  bool newDb)
 {

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ using namespace Firebird;`
`52`	`52`
`53`	`53`
`54`	`54`	`// static method`
`55`		`-Jrd::Attachment* Jrd::Attachment::create(Database* dbb, Firebird::IProvider* provider)`
	`55`	`+Jrd::Attachment* Jrd::Attachment::create(Database* dbb, JProvider* provider)`
`56`	`56`	`{`
`57`	`57`	`MemoryPool* const pool = dbb->createPool();`
`58`	`58`
`@@ -171,7 +171,7 @@ void Jrd::Attachment::backupStateReadUnLock(thread_db* tdbb)`
`171`	`171`	`}`
`172`	`172`
`173`	`173`
`174`		`-Jrd::Attachment::Attachment(MemoryPool* pool, Database* dbb, IProvider* provider)`
	`174`	`+Jrd::Attachment::Attachment(MemoryPool* pool, Database* dbb, JProvider* provider)`
`175`	`175`	`: att_pool(pool),`
`176`	`176`	`att_memory_stats(&dbb->dbb_memory_stats),`
`177`	`177`	`att_database(dbb),`
Original file line number	Diff line number	Diff line change
`@@ -167,9 +167,7 @@ void InternalConnection::attach(thread_db* tdbb, const PathName& dbName,`
`167`	`167`	`FbLocalStatus status;`
`168`	`168`	`{`
`169`	`169`	`EngineCallbackGuard guard(tdbb, *this, FB_FUNCTION);`
`170`		`- AutoPlugin<JProvider> jInstance(JProvider::getInstance());`
`171`		`- jInstance->setDbCryptCallback(&status, tdbb->getAttachment()->att_crypt_callback);`
`172`		`- m_attachment.assignRefNoIncr(jInstance->attachDatabase(&status, m_dbName.c_str(),`
	`170`	`+ m_attachment.assignRefNoIncr(attachment->getProvider()->attachDatabase(&status, m_dbName.c_str(),`
`173`	`171`	`newDpb.getBufferLength(), newDpb.getBuffer()));`
`174`	`172`	`}`
`175`	`173`