]> git.sesse.net Git - freerainbowtables/commitdiff
merged paths
authorMartin Westergaard <admin@freerainbowtables.com>
Mon, 1 Nov 2010 18:38:05 +0000 (19:38 +0100)
committerMartin Westergaard <admin@freerainbowtables.com>
Mon, 1 Nov 2010 18:38:05 +0000 (19:38 +0100)
1  2 
Client Applications/rcracki_mt/CrackEngine.cpp

index 7640a6310211340cdd4aef3b69aa75ccd34bbbae,8d3981e64b42124c29dd6836fd176930b2fd0156..0a4b1818bb9eb889771e94017cc28fb0ee9302c2
@@@ -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
                                                m_fTotalDiskAccessTime += fTime;
  
                                                int nRainbowChainCountRead = nDataRead / 16;
 +
+                                               if(doRti2Format) {
+                                                       nRainbowChainCountRead = nDataRead / 8;
+                                               }
++
                                                // Verify table chunk
                                                if (!fVerified)
                                                {