X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Common%2Frt%20api%2FRTI2Reader.cpp;h=57f671c3459dd9b3dd2f4c8116591ea8956d47e4;hb=47c71901e7a97c226c8f1df749e3606d43656f32;hp=6fb0cb914507ef011bd4a07cb0c58d0e9aa3df1b;hpb=0fb676244827a448dc60118d6558c4a4e346ffee;p=freerainbowtables

diff --git a/Common/rt api/RTI2Reader.cpp b/Common/rt api/RTI2Reader.cpp
index 6fb0cb9..57f671c 100644
--- a/Common/rt api/RTI2Reader.cpp	
+++ b/Common/rt api/RTI2Reader.cpp	
@@ -2,8 +2,8 @@
  * freerainbowtables is a project for generating, distributing, and using
  * perfect rainbow tables
  *
- * Copyright 2010 Martin Westergaard Jørgensen <martinwj2005@gmail.com>
- * Copyright 2010 James Nobis <frt@quelrod.net>
+ * Copyright 2010, 2011 Martin Westergaard Jørgensen <martinwj2005@gmail.com>
+ * Copyright 2010, 2011 James Nobis <frt@quelrod.net>
  *
  * This file is part of freerainbowtables.
  *
@@ -47,7 +47,11 @@ RTI2Reader::RTI2Reader(string Filename)
 	long len = GetFileLen(pFileIndex);
 	fseek(pFileIndex, 0, SEEK_SET);
 
-	m_pIndex = new unsigned char[len];
+	m_pIndex = new (nothrow) unsigned char[len];
+	if(m_pIndex == NULL) {
+		printf("Error allocating %ld MB memory for index in RTI2Reader::RTI2Reader()", len / (1024 * 1024));
+		exit(-2);
+	}
 	if(fread(m_pIndex, 1, len, pFileIndex) != (unsigned long)len)
 	{
 		printf("Error while reading index file");
@@ -66,7 +70,7 @@ RTI2Reader::RTI2Reader(string Filename)
 	fseek(m_pFile, 0, SEEK_SET);
 	if(len % m_chainsizebytes > 0)
 	{
-		printf("Invalid filesize %ld\n", len);
+		printf("Invalid filesize %lu\n", len);
 		return;
 	}
 	
@@ -80,13 +84,13 @@ RTI2Reader::~RTI2Reader(void)
 
 }
 
-unsigned int RTI2Reader::GetChainsLeft()
+uint32 RTI2Reader::GetChainsLeft()
 {
 	long len = GetFileLen(m_pFile);
 	return len / m_chainsizebytes - m_chainPosition;
 }
 
-int RTI2Reader::ReadChains(unsigned int &numChains, RainbowChainCP *pData)
+int RTI2Reader::ReadChains(unsigned int &numChains, RainbowChain *pData)
 {
 	if(strncmp(m_pHeader->header, "RTI2", 4) != 0)
 	{
@@ -100,6 +104,7 @@ int RTI2Reader::ReadChains(unsigned int &numChains, RainbowChainCP *pData)
 	
 	while(true) // Fast forward to current position
 	{
+		/// XXX
 		// ALERT: Possible problem here if m_indexrowsizebytes > 1 as pNumChains is a unsigned char.
 		unsigned int NumChainsInRow = (unsigned int)*(pNumChains + indexRow * m_indexrowsizebytes);
 		if(m_indexrowsizebytes > 1)