X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Client%20Applications%2Frcracki_mt%2FRTI2Reader.cpp;h=54538986c009b478c56265a66f991f9dcbe679a9;hb=47c71901e7a97c226c8f1df749e3606d43656f32;hp=3d8154d2ebaf688a3972d13041ce53b3810f025e;hpb=ce75ca839a9cd1863ea13636ffebf7ee1dcc4267;p=freerainbowtables

diff --git a/Client Applications/rcracki_mt/RTI2Reader.cpp b/Client Applications/rcracki_mt/RTI2Reader.cpp
index 3d8154d..5453898 100644
--- a/Client Applications/rcracki_mt/RTI2Reader.cpp	
+++ b/Client Applications/rcracki_mt/RTI2Reader.cpp	
@@ -4,9 +4,9 @@
  *
  * Copyright 2010 Martin Westergaard Jørgensen <martinwj2005@gmail.com>
  * Copyright 2010 Daniël Niggebrugge <niggebrugge@fox-it.com>
- * Copyright 2010 James Nobis <frt@quelrod.net>
+ * Copyright 2010, 2011 James Nobis <frt@quelrod.net>
  *
- * This file is part of racrcki_mt.
+ * This file is part of rcracki_mt.
  *
  * rcracki_mt is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -45,11 +45,15 @@ RTI2Reader::RTI2Reader(string Filename)
 	}
 	m_chainPosition = 0;
 
-	unsigned int len = GetFileLen(pFileIndex);
+	long len = GetFileLen(pFileIndex);
 	fseek(pFileIndex, 0, SEEK_SET);
 
-	m_pIndex = new unsigned char[len];
-	if(fread(m_pIndex, 1, len, pFileIndex) != 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");
 		exit(1);
@@ -59,15 +63,15 @@ RTI2Reader::RTI2Reader(string Filename)
 	memcpy(m_pHeader, m_pIndex, sizeof(RTI2Header));
 	m_pHeader->m_cppos = (unsigned int*)(m_pIndex + 8);
 	m_pHeader->prefixstart = *(uint64*)(m_pIndex + 8 + (m_pHeader->rti_cplength * 4));
-	m_chainsizebytes = ceil((float)(m_pHeader->rti_startptlength + m_pHeader->rti_endptlength + m_pHeader->rti_cplength) / 8); // Get the size of each chain in bytes
-	m_indexrowsizebytes = ceil((float)m_pHeader->rti_index_numchainslength / 8);
+	m_chainsizebytes = (uint32)ceil((float)(m_pHeader->rti_startptlength + m_pHeader->rti_endptlength + m_pHeader->rti_cplength) / 8); // Get the size of each chain in bytes
+	m_indexrowsizebytes = (uint32)ceil((float)m_pHeader->rti_index_numchainslength / 8);
 	// Check the filesize
 	fseek(m_pFile, 0, SEEK_END);
 	len = ftell(m_pFile);
 	fseek(m_pFile, 0, SEEK_SET);
 	if(len % m_chainsizebytes > 0)
 	{
-		printf("Invalid filesize %u\n", len);
+		printf("Invalid filesize %lu\n", len);
 		return;
 	}
 	
@@ -81,9 +85,9 @@ RTI2Reader::~RTI2Reader(void)
 
 }
 
-unsigned int RTI2Reader::GetChainsLeft()
+uint32 RTI2Reader::GetChainsLeft()
 {
-	int len = GetFileLen(m_pFile);
+	long len = GetFileLen(m_pFile);
 	return len / m_chainsizebytes - m_chainPosition;
 }
 
@@ -101,6 +105,7 @@ int RTI2Reader::ReadChains(unsigned int &numChains, RainbowChainO *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)
@@ -121,7 +126,7 @@ int RTI2Reader::ReadChains(unsigned int &numChains, RainbowChainO *pData)
 	uint64 chainrow = 0; // Buffer to store a single read chain
 	unsigned int chainsProcessed = 0; // Number of chains processed
 
-	// ALERT: same problem with unsigned char here.
+	// XXX: same problem with unsigned char here.
 	unsigned int NumChainsInRow = *(pNumChains + indexRow);
 	while(chainsProcessed < numChains && fread(&chainrow, 1, m_chainsizebytes, m_pFile) == m_chainsizebytes)
 	{
@@ -138,13 +143,17 @@ int RTI2Reader::ReadChains(unsigned int &numChains, RainbowChainO *pData)
 			curRowPosition = 0;
 		}
 		// Load the starting point from the data
-		pData[chainsProcessed].nIndexS = chainrow << 64 - m_pHeader->rti_startptlength;
-		pData[chainsProcessed].nIndexS = pData[chainsProcessed].nIndexS >> 64 - m_pHeader->rti_startptlength;
+		pData[chainsProcessed].nIndexS = chainrow << ( 64 - m_pHeader->rti_startptlength );
+		pData[chainsProcessed].nIndexS = pData[chainsProcessed].nIndexS >> ( 64 - m_pHeader->rti_startptlength );
 
 		// Load the ending point prefix	
-		pData[chainsProcessed].nIndexE = m_pHeader->prefixstart + indexRow << m_pHeader->rti_endptlength;
+		pData[chainsProcessed].nIndexE = ( m_pHeader->prefixstart + indexRow ) << m_pHeader->rti_endptlength;
 		// Append the ending point suffix
+#if defined(_WIN32) && !defined(__GNUC__)
+		pData[chainsProcessed].nIndexE |= (chainrow & (0xFFFFFFFFFFFFFFFFI64 >> m_pHeader->rti_cplength)) >> m_pHeader->rti_startptlength;
+#else
 		pData[chainsProcessed].nIndexE |= (chainrow & (0xFFFFFFFFFFFFFFFFllu >> m_pHeader->rti_cplength)) >> m_pHeader->rti_startptlength;
+#endif
 		//pData[chainsProcessed].nCheckPoint = (chainrow >> m_pHeader->rti_startptlength + m_pHeader->rti_endptlength);
 		curRowPosition++;
 		chainsProcessed++;