Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-31 18:29:02 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed some leaking memory issues in loadList() methods, and also increased consistency by not returning non empty list with deleted items inside

Browse source
This commit is contained in:
csoler 2015-12-30 18:20:09 -05:00
parent 48750cdb51
commit 8a41554754
22 changed files with 208 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/ft/ftcontroller.cc
View file

@ -2224,6 +2224,7 @@ bool ftController::loadList(std::list<RsItem *>& load)
/* cleanup */
delete (*it);
}
load.clear() ;
return true;
}

5
libretroshare/src/ft/ftdbase.cc
View file

@ -328,6 +328,8 @@ bool ftFiMonitor::loadList(std::list<RsItem *>& load)
if(sscanf(mit->second.c_str(),"%d",&t) == 1)
setWatchPeriod(t);
}
delete *it ;
continue ;
}
RsFileConfigItem *fi = dynamic_cast<RsFileConfigItem *>(*it);
@ -348,10 +350,13 @@ bool ftFiMonitor::loadList(std::list<RsItem *>& load)
info.shareflags &= ~DIR_FLAGS_NETWORK_WIDE_GROUPS ; // disabling this flag for know, for consistency reasons
dirList.push_back(info) ;
delete *it ;
}
/* set directories */
setSharedDirectories(dirList);
load.clear() ;
return true;
}

1
libretroshare/src/ft/ftextralist.cc
View file

@ -484,6 +484,7 @@ bool ftExtraList::loadList(std::list<RsItem *>& load)
/********************************** WINDOWS/UNIX SPECIFIC PART ******************/
}
load.clear() ;
return true;
}