Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-23 00:09:50 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #575 from PhenomRetroShare/FixCrashOnCheckBigBigFileStorage

Browse Source 
Fix Crash when checking a big-big file storage.
This commit is contained in:
Cyril Soler 2016-11-19 14:42:43 +01:00 committed by GitHub
commit 5b9b63efcd
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libretroshare/src/file_sharing/dir_hierarchy.cc
View File

@ -784,6 +784,12 @@ bool InternalFileHierarchyStorage::check(std::string& error_string) // checks co
// recurs go through all entries, check that all // recurs go through all entries, check that all
error_string = ""; error_string = "";
bool bDirOut = false;
bool bDirDouble = false;
bool bFileOut = false;
bool bFileDouble = false;
bool bOrphean = false;
std::vector<uint32_t> hits(mNodes.size(),0) ; // count hits of children. Should be 1 for all in the end. Otherwise there's an error. std::vector<uint32_t> hits(mNodes.size(),0) ; // count hits of children. Should be 1 for all in the end. Otherwise there's an error.
hits[0] = 1 ; // because 0 is never the child of anyone hits[0] = 1 ; // because 0 is never the child of anyone
@ -799,13 +805,13 @@ bool InternalFileHierarchyStorage::check(std::string& error_string) // checks co
{ {
if(de.subdirs[j] >= mNodes.size()) if(de.subdirs[j] >= mNodes.size())
{ {
error_string += " - Node child dir out of tab!" ; if(!bDirOut){ error_string += " - Node child dir out of tab!"; bDirOut = true;}
de.subdirs[j] = de.subdirs.back() ; de.subdirs[j] = de.subdirs.back() ;
de.subdirs.pop_back(); de.subdirs.pop_back();
} }
else if(hits[de.subdirs[j]] != 0) else if(hits[de.subdirs[j]] != 0)
{ {
error_string += " - Double hit on a single node dir." ; if(!bDirDouble){ error_string += " - Double hit on a single node dir."; bDirDouble = true;}
de.subdirs[j] = de.subdirs.back() ; de.subdirs[j] = de.subdirs.back() ;
de.subdirs.pop_back(); de.subdirs.pop_back();
} }
@ -819,13 +825,13 @@ bool InternalFileHierarchyStorage::check(std::string& error_string) // checks co
{ {
if(de.subfiles[j] >= mNodes.size()) if(de.subfiles[j] >= mNodes.size())
{ {
error_string += " - Node child file out of tab!" ; if(!bFileOut){ error_string += " - Node child file out of tab!"; bFileOut = true;}
de.subfiles[j] = de.subfiles.back() ; de.subfiles[j] = de.subfiles.back() ;
de.subfiles.pop_back(); de.subfiles.pop_back();
} }
else if(hits[de.subfiles[j]] != 0) else if(hits[de.subfiles[j]] != 0)
{ {
error_string += " - Double hit on a single node file." ; if(!bFileDouble){ error_string += " - Double hit on a single node file."; bFileDouble = true;}
de.subfiles[j] = de.subfiles.back() ; de.subfiles[j] = de.subfiles.back() ;
de.subfiles.pop_back(); de.subfiles.pop_back();
} }
@ -842,7 +848,7 @@ bool InternalFileHierarchyStorage::check(std::string& error_string) // checks co
for(uint32_t i=0;i<hits.size();++i) for(uint32_t i=0;i<hits.size();++i)
if(hits[i] == 0 && mNodes[i] != NULL) if(hits[i] == 0 && mNodes[i] != NULL)
{ {
error_string += " - Orphean node!" ; if(!bOrphean){ error_string += " - Orphean node!"; bOrphean = true;}
deleteNode(i) ; // we don't care if it's a file or a dir. deleteNode(i) ; // we don't care if it's a file or a dir.
} }