debian/gbp.conf: point debian-branch to master

[apt.git] / apt-pkg / pkgcachegen.cc

diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
index 69c8fd105f67122b8b0371241140a0a9f917164e..e1958f45ace8b4b3162128e638dbc02800514ed6 100644 (file)
--- a/apt-pkg/pkgcachegen.cc
+++ b/apt-pkg/pkgcachegen.cc
@@ -125,7 +125,7 @@ pkgCacheGenerator::pkgCacheGenerator(DynamicMMap *pMap,OpProgress *Prog) :
    advoid a problem during a crash */
 pkgCacheGenerator::~pkgCacheGenerator()
 {
    advoid a problem during a crash */
 pkgCacheGenerator::~pkgCacheGenerator()
 {

-   if (_error->PendingError() == true)
+   if (_error->PendingError() == true || Map.validData() == false)

       return;
    if (Map.Sync() == false)
       return;
       return;
    if (Map.Sync() == false)
       return;


@@ -1307,6 +1307,8 @@ static bool CheckValidity(const string &CacheFile,
    // Map it
    FileFd CacheF(CacheFile,FileFd::ReadOnly);
    std::unique_ptr<MMap> Map(new MMap(CacheF,0));
    // Map it
    FileFd CacheF(CacheFile,FileFd::ReadOnly);
    std::unique_ptr<MMap> Map(new MMap(CacheF,0));

+   if (unlikely(Map->validData()) == false)
+      return false;

    pkgCache Cache(Map.get());
    if (_error->PendingError() || Map->Size() == 0)
    {
    pkgCache Cache(Map.get());
    if (_error->PendingError() || Map->Size() == 0)
    {


@@ -1434,7 +1436,6 @@ static bool BuildCache(pkgCacheGenerator &Gen,
                       pkgSourceList const * const List,
                       FileIterator const Start, FileIterator const End)
 {
                       pkgSourceList const * const List,
                       FileIterator const Start, FileIterator const End)
 {

-   std::vector<pkgIndexFile *> Files;

    bool mergeFailure = false;
 
    auto const indexFileMerge = [&](pkgIndexFile * const I) {
    bool mergeFailure = false;
 
    auto const indexFileMerge = [&](pkgIndexFile * const I) {


@@ -1540,6 +1541,8 @@ static bool loadBackMMapFromFile(std::unique_ptr<pkgCacheGenerator> &Gen,
       std::unique_ptr<DynamicMMap> &Map, OpProgress * const Progress, std::string const &FileName)
 {
    Map.reset(CreateDynamicMMap(NULL, 0));
       std::unique_ptr<DynamicMMap> &Map, OpProgress * const Progress, std::string const &FileName)
 {
    Map.reset(CreateDynamicMMap(NULL, 0));

+   if (unlikely(Map->validData()) == false)
+      return false;

    FileFd CacheF(FileName, FileFd::ReadOnly);
    if (CacheF.IsOpen() == false || CacheF.Failed())
       return false;
    FileFd CacheF(FileName, FileFd::ReadOnly);
    if (CacheF.IsOpen() == false || CacheF.Failed())
       return false;


@@ -1629,6 +1632,8 @@ bool pkgCacheGenerator::MakeStatusCache(pkgSourceList &List,OpProgress *Progress
 
    // At this point we know we need to construct something, so get storage ready
    std::unique_ptr<DynamicMMap> Map(CreateDynamicMMap(NULL, 0));
 
    // At this point we know we need to construct something, so get storage ready
    std::unique_ptr<DynamicMMap> Map(CreateDynamicMMap(NULL, 0));

+   if (unlikely(Map->validData()) == false)
+      return false;

    if (Debug == true)
       std::clog << "Open memory Map (not filebased)" << std::endl;
 
    if (Debug == true)
       std::clog << "Open memory Map (not filebased)" << std::endl;
 


@@ -1717,6 +1722,8 @@ bool pkgCacheGenerator::MakeOnlyStatusCache(OpProgress *Progress,DynamicMMap **O
 
    ScopedErrorMerge sem;
    std::unique_ptr<DynamicMMap> Map(CreateDynamicMMap(NULL, 0));
 
    ScopedErrorMerge sem;
    std::unique_ptr<DynamicMMap> Map(CreateDynamicMMap(NULL, 0));

+   if (unlikely(Map->validData()) == false)
+      return false;

    map_filesize_t CurrentSize = 0;
    map_filesize_t TotalSize = 0;
    TotalSize = ComputeSize(NULL, Files.begin(), Files.end());
    map_filesize_t CurrentSize = 0;
    map_filesize_t TotalSize = 0;
    TotalSize = ComputeSize(NULL, Files.begin(), Files.end());