From: Martin Westergaard <admin@freerainbowtables.com>
Date: Mon, 1 Nov 2010 18:38:05 +0000 (+0100)
Subject: merged paths
X-Git-Url: https://git.sesse.net/?p=freerainbowtables;a=commitdiff_plain;h=3d42602c1f746b5768f0e6c9d22884a9806eadc0

merged paths
---

3d42602c1f746b5768f0e6c9d22884a9806eadc0
diff --cc Client Applications/rcracki_mt/CrackEngine.cpp
index 7640a63,8d3981e..0a4b181
--- a/Client Applications/rcracki_mt/CrackEngine.cpp
+++ b/Client Applications/rcracki_mt/CrackEngine.cpp
@@@ -1068,9 -1073,10 +1073,11 @@@ void CCrackEngine::SearchRainbowTable(s
  						gettimeofday( &tv, NULL );
  						if ( doRti2Format )
  						{
- 							nDataToRead = nAllocatedSize / 16;
- 							nDataRead = nDataToRead;
- 							pReader->ReadChains(nDataRead, pChain);
+ 							nDataRead = nAllocatedSize / 16;
+ 							if(pReader->GetChainsLeft() <= 0) // No more data
+ 								break; 
+ 							pReader->ReadChains(nDataRead, (RainbowChain*)pChain);
++
  							nDataRead *= 8; // Convert from chains read to bytes
  						}
  						else
@@@ -1085,7 -1091,9 +1092,11 @@@
  						m_fTotalDiskAccessTime += fTime;
  
  						int nRainbowChainCountRead = nDataRead / 16;
 +
+ 						if(doRti2Format) {
+ 							nRainbowChainCountRead = nDataRead / 8;
+ 						}
++
  						// Verify table chunk
  						if (!fVerified)
  						{