From dd1fc18d107a2cac81acdd8055403bf8d8ca7413 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 11 Jan 2018 21:08:46 +0300
Subject: dbx_mdbx:

- Remap() / MDBX_CHECK perversion removed;
- mdbx_env_set_geometry() is used to grow file automatically
---
 plugins/Dbx_mdbx/src/dbcrypt.cpp | 68 +++++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 32 deletions(-)

(limited to 'plugins/Dbx_mdbx/src/dbcrypt.cpp')

diff --git a/plugins/Dbx_mdbx/src/dbcrypt.cpp b/plugins/Dbx_mdbx/src/dbcrypt.cpp
index 6142a7b577..590cf8494a 100644
--- a/plugins/Dbx_mdbx/src/dbcrypt.cpp
+++ b/plugins/Dbx_mdbx/src/dbcrypt.cpp
@@ -48,17 +48,18 @@ CRYPTO_PROVIDER* CDbxMDBX::SelectProvider()
 	}
 	else pProv = ppProvs[0];
 
-	for (;; Remap()) {
+	{
 		txn_ptr txn(m_env);
-
 		MDBX_val key = { DBKey_Crypto_Provider, sizeof(DBKey_Crypto_Provider) }, value = { pProv->pszName, mir_strlen(pProv->pszName) + 1 };
-		MDBX_CHECK(mdbx_put(txn, m_dbCrypto, &key, &value, 0), nullptr);
+		if (mdbx_put(txn, m_dbCrypto, &key, &value, 0) != MDBX_SUCCESS)
+			return nullptr;
 
 		key.iov_len = sizeof(DBKey_Crypto_IsEncrypted); key.iov_base = DBKey_Crypto_IsEncrypted; value.iov_len = sizeof(bool); value.iov_base = &bTotalCrypt;
-		MDBX_CHECK(mdbx_put(txn, m_dbCrypto, &key, &value, 0), nullptr);
+		if (mdbx_put(txn, m_dbCrypto, &key, &value, 0) != MDBX_SUCCESS)
+			return nullptr;
 
-		if (txn.commit() == MDBX_SUCCESS)
-			break;
+		if (txn.commit() != MDBX_SUCCESS)
+			return nullptr;
 	}
 
 	return pProv;
@@ -124,14 +125,17 @@ void CDbxMDBX::StoreKey()
 	size_t iKeyLength = m_crypto->getKeyLength();
 	BYTE *pKey = (BYTE*)_alloca(iKeyLength);
 	m_crypto->getKey(pKey, iKeyLength);
-
-	for (;; Remap()) {
+	{
 		txn_ptr txn(m_env);
 		MDBX_val key = { DBKey_Crypto_Key, sizeof(DBKey_Crypto_Key) }, value = { pKey, iKeyLength };
-		mdbx_put(txn, m_dbCrypto, &key, &value, 0);
-		if (txn.commit() == MDBX_SUCCESS)
-			break;
+		int rc = mdbx_put(txn, m_dbCrypto, &key, &value, 0);
+		if (rc == MDBX_SUCCESS)
+			rc = txn.commit();
+		/* FIXME: throw an exception */
+		assert(rc == MDBX_SUCCESS);
+		UNREFERENCED_PARAMETER(rc);
 	}
+
 	SecureZeroMemory(pKey, iKeyLength);
 }
 
@@ -175,7 +179,10 @@ int CDbxMDBX::EnableEncryption(bool bEncrypted)
 		for (auto it = lstEvents.begin(); it != lstEvents.end(); ++it) {
 			MEVENT &hDbEvent = *it;
 			MDBX_val key = { &hDbEvent, sizeof(MEVENT) }, data;
-			mdbx_get(txnro, m_dbEvents, &key, &data);
+			int rc = mdbx_get(txnro, m_dbEvents, &key, &data);
+			/* FIXME: throw an exception */
+			assert(rc == MDBX_SUCCESS);
+			(void)rc;
 
 			const DBEvent *dbEvent = (const DBEvent*)data.iov_base;
 			const BYTE    *pBlob = (BYTE*)(dbEvent + 1);
@@ -194,32 +201,29 @@ int CDbxMDBX::EnableEncryption(bool bEncrypted)
 					dwNewFlags = dbEvent->flags | DBEF_ENCRYPTED;
 				}
 
-				for (;; Remap()) {
-					txn_ptr txn(m_env);
-					data.iov_len = sizeof(DBEvent) + nNewBlob;
-					MDBX_CHECK(mdbx_put(txn, m_dbEvents, &key, &data, MDBX_RESERVE), 1);
-
-					DBEvent *pNewDBEvent = (DBEvent *)data.iov_base;
-					*pNewDBEvent = *dbEvent;
-					pNewDBEvent->cbBlob = (uint16_t)nNewBlob;
-					pNewDBEvent->flags = dwNewFlags;
-					memcpy(pNewDBEvent + 1, pNewBlob, nNewBlob);
+				txn_ptr txn(m_env);
+				data.iov_len = sizeof(DBEvent) + nNewBlob;
+				if (mdbx_put(txn, m_dbEvents, &key, &data, MDBX_RESERVE) != MDBX_SUCCESS)
+					return 1;
 
+				DBEvent *pNewDBEvent = (DBEvent *)data.iov_base;
+				*pNewDBEvent = *dbEvent;
+				pNewDBEvent->cbBlob = (uint16_t)nNewBlob;
+				pNewDBEvent->flags = dwNewFlags;
+				memcpy(pNewDBEvent + 1, pNewBlob, nNewBlob);
 
-					if (txn.commit() == MDBX_SUCCESS)
-						break;
-				}
+				if (txn.commit() != MDBX_SUCCESS)
+					return 1;
 			}
 		}
 	}
 
-	for (;; Remap()) {
-		txn_ptr txn(m_env);
-		MDBX_val key = { DBKey_Crypto_IsEncrypted, sizeof(DBKey_Crypto_IsEncrypted) }, value = { &bEncrypted, sizeof(bool) };
-		MDBX_CHECK(mdbx_put(txn, m_dbCrypto, &key, &value, 0), 1);
-		if (txn.commit() == MDBX_SUCCESS)
-			break;
-	}
+	txn_ptr txn(m_env);
+	MDBX_val key = { DBKey_Crypto_IsEncrypted, sizeof(DBKey_Crypto_IsEncrypted) }, value = { &bEncrypted, sizeof(bool) };
+	if (mdbx_put(txn, m_dbCrypto, &key, &value, 0) != MDBX_SUCCESS)
+		return 1;
+	if (txn.commit() != MDBX_SUCCESS)
+		return 1;
 
 	m_bEncrypted = bEncrypted;
 	return 0;
-- 
cgit v1.2.3