2 files changed, 13 insertions, 12 deletions
diff --git a/plugins/Dbx_mdb/src/dbcontacts.cpp b/plugins/Dbx_mdb/src/dbcontacts.cpp
index f19811b10e..0aa4206854 100644
--- a/plugins/Dbx_mdb/src/dbcontacts.cpp
+++ b/plugins/Dbx_mdb/src/dbcontacts.cpp
@@ -91,13 +91,11 @@ STDMETHODIMP_(LONG) CDbxMdb::DeleteContact(MCONTACT contactID)
 		return 1;
 
 	// delete 
-	// call notifier while outside mutex
-	NotifyEventHooks(hContactDeletedEvent, contactID, 0);
 	
 	mir_cslockfull lck(m_csDbAccess);
 	
 	{
-		LIST<EventItem> events(50);
+		LIST<EventItem> events(25);
 		GatherContactHistory(contactID, events);
 		while (events.getCount())
 		{
@@ -144,9 +142,11 @@ STDMETHODIMP_(LONG) CDbxMdb::DeleteContact(MCONTACT contactID)
 	if (contactID == m_hLastCachedContact)
 		m_hLastCachedContact = NULL;
 
-
 	lck.unlock();
 
+	// call notifier while outside mutex
+	NotifyEventHooks(hContactDeletedEvent, contactID, 0);
+
 	return 0;
 }
 
diff --git a/plugins/Dbx_mdb/src/dbevents.cpp b/plugins/Dbx_mdb/src/dbevents.cpp
index 466cd3b452..ee6c354e84 100644
--- a/plugins/Dbx_mdb/src/dbevents.cpp
+++ b/plugins/Dbx_mdb/src/dbevents.cpp
@@ -72,10 +72,12 @@ STDMETHODIMP_(MEVENT) CDbxMdb::AddEvent(MCONTACT contactID, DBEVENTINFO *dbei)
 	BYTE *pBlob = dbei->pBlob;
 
 	mir_ptr<BYTE> pCryptBlob;
-	if (m_bEncrypted) {
+	if (m_bEncrypted) 
+	{
 		size_t len;
 		BYTE *pResult = m_crypto->encodeBuffer(pBlob, dbe.cbBlob, &len);
-		if (pResult != NULL) {
+		if (pResult != nullptr) 
+		{
 			pCryptBlob = pBlob = pResult;
 			dbe.cbBlob = (DWORD)len;
 			dbe.flags |= DBEF_ENCRYPTED;
@@ -155,8 +157,8 @@ STDMETHODIMP_(BOOL) CDbxMdb::DeleteEvent(MCONTACT contactID, MEVENT hDbEvent)
 		cc2 = m_cache->GetCachedContact(dbe->contactID);
 	}
 
-	const auto Snapshot = [&]() { cc->Snapshot(); if (cc2) cc2->Snapshot(); };
-	const auto Revert = [&]() { cc->Revert(); if (cc2) cc2->Revert(); };
+	const auto Snapshot = [&cc, &cc2]() { cc->Snapshot(); if (cc2) cc2->Snapshot(); };
+	const auto Revert = [&cc, &cc2]() { cc->Revert(); if (cc2) cc2->Revert(); };
 
 	for (Snapshot();; Revert(), Remap())
 	{
@@ -246,19 +248,18 @@ STDMETHODIMP_(BOOL) CDbxMdb::GetEvent(MEVENT hDbEvent, DBEVENTINFO *dbei)
 	dbei->cbBlob = dbe->cbBlob;
 	if (bytesToCopy && dbei->pBlob) 
 	{
-		BYTE *pSrc = (BYTE*)data.mv_data + sizeof(DBEvent);
+		const BYTE *pSrc = (BYTE*)data.mv_data + sizeof(DBEvent);
 		if (dbe->flags & DBEF_ENCRYPTED) 
 		{
 			dbei->flags &= ~DBEF_ENCRYPTED;
 			size_t len;
-			BYTE* pBlob = (BYTE*)m_crypto->decodeBuffer(pSrc, dbe->cbBlob, &len);
-			if (pBlob == NULL)
+			mir_ptr<BYTE> pBlob((BYTE*)m_crypto->decodeBuffer(pSrc, dbe->cbBlob, &len));
+			if (pBlob == nullptr)
 				return 1;
 
 			memcpy(dbei->pBlob, pBlob, bytesToCopy);
 			if (bytesToCopy > len)
 				memset(dbei->pBlob + len, 0, bytesToCopy - len);
-			mir_free(pBlob);
 		}
 		else memcpy(dbei->pBlob, pSrc, bytesToCopy);
 	}