X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Common%2Frt%20api%2FMemoryPool.cpp;h=a6745073f0e97e9953c510280ac32b405106de2f;hb=86bbf0fd5ba4e07d3279b4179fd8fc808198eaae;hp=1019b4f736212ce01b987e1d9fa729da48240a36;hpb=bcfd4a8e2d07b3a0fce0bc8e471d8562b142b7e0;p=freerainbowtables

diff --git a/Common/rt api/MemoryPool.cpp b/Common/rt api/MemoryPool.cpp
index 1019b4f..a674507 100644
--- a/Common/rt api/MemoryPool.cpp	
+++ b/Common/rt api/MemoryPool.cpp	
@@ -1,8 +1,28 @@
 /*
-   RainbowCrack - a general propose implementation of Philippe Oechslin's faster time-memory trade-off technique.
-
-   Copyright (C) Zhu Shuanglei <shuanglei@hotmail.com>
-*/
+ * freerainbowtables is a project for generating, distributing, and using
+ * perfect rainbow tables
+ *
+ * Copyright (C) Zhu Shuanglei <shuanglei@hotmail.com>
+ * Copyright Martin Westergaard Jørgensen <martinwj2005@gmail.com>
+ * Copyright 2009, 2010 Daniël Niggebrugge <niggebrugge@fox-it.com>
+ * Copyright 2009, 2010 James Nobis <frt@quelrod.net>
+ * Copyright 2010 uroskn
+ *
+ * This file is part of freerainbowtables.
+ *
+ * freerainbowtables is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * freerainbowtables is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with freerainbowtables.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "MemoryPool.h"
 #include "Public.h"
@@ -25,9 +45,11 @@ CMemoryPool::CMemoryPool()
 
 CMemoryPool::~CMemoryPool()
 {
-	if (m_pMem != NULL)
-	{
-		delete m_pMem;
+	if (m_pMem != NULL)	{
+#ifdef _MEMORYDEBUG
+		printf("Freeing %i bytes of memory\n", m_nMemSize);
+#endif 
+		delete [] m_pMem;
 		m_pMem = NULL;
 		m_nMemSize = 0;
 	}
@@ -35,43 +57,53 @@ CMemoryPool::~CMemoryPool()
 
 unsigned char* CMemoryPool::Allocate(unsigned int nFileLen, unsigned int& nAllocatedSize)
 {
-	if (nFileLen <= m_nMemSize)
-	{
+	if (nFileLen <= m_nMemSize)	{
 		nAllocatedSize = nFileLen;
 		return m_pMem;
 	}
 
 	unsigned int nTargetSize;
-	if (nFileLen < m_nMemMax)
+	if (nFileLen < m_nMemMax) {
 		nTargetSize = nFileLen;
-	else
+	}
+	else {
 		nTargetSize = m_nMemMax;
-
+	}
 	// Free existing memory
-	if (m_pMem != NULL)
-	{
-		delete m_pMem;
+	if (m_pMem != NULL)	{
+#ifdef _MEMORYDEBUG
+		printf("Freeing %i bytes of memory\n", m_nMemSize);
+#endif 
+		delete [] m_pMem;
 		m_pMem = NULL;
 		m_nMemSize = 0;
 	}
 
 	// Allocate new memory
 	//printf("allocating %u bytes memory\n", nTargetSize);
-//	m_pMem = new unsigned char[nTargetSize];
-m_pMem = new (nothrow) unsigned char[nTargetSize];
-while (m_pMem == NULL && nTargetSize >= 512 * 1024 * 1024 )
-{
-   nTargetSize -= 16 * 1024 * 1024;
-   m_pMem = new (nothrow) unsigned char[nTargetSize];
-}
-	if (m_pMem != NULL)
-	{
+	//	m_pMem = new unsigned char[nTargetSize];
+#ifdef _MEMORYDEBUG
+		printf("Allocating %i bytes of memory - ", nTargetSize);
+#endif 
+
+	m_pMem = new (nothrow) unsigned char[nTargetSize];
+	while (m_pMem == NULL && nTargetSize >= 512 * 1024 * 1024 )	{
+#ifdef _MEMORYDEBUG
+		printf("failed!\n");
+		printf("Allocating %i bytes of memory (backup) - ", nTargetSize);
+#endif 
+	   nTargetSize -= 16 * 1024 * 1024;
+	   m_pMem = new (nothrow) unsigned char[nTargetSize];
+	}
+	if (m_pMem != NULL)	{
+#ifdef _MEMORYDEBUG
+		printf("success!\n");
+#endif
 		m_nMemSize = nTargetSize;
 		nAllocatedSize = nTargetSize;
 		return m_pMem;
 	}
-	else
-	{
+	else {
 		nAllocatedSize = 0;
 		return NULL;
 	}