Fix double free (closes: #711045)

[apt.git] / ftparchive / cachedb.h

diff --git a/ftparchive/cachedb.h b/ftparchive/cachedb.h
index c10f41eccc5300769f51009935382156c117d504..b9ced941843e5e17b3dd6d95a46e45730ee1683d 100644 (file)
--- a/ftparchive/cachedb.h
+++ b/ftparchive/cachedb.h
@@ -13,16 +13,16 @@
 #define CACHEDB_H
 
 
 #define CACHEDB_H
 
 

+#include <apt-pkg/debfile.h>

 
 #include <db.h>
 
 #include <db.h>

-#include <string>
-#include <apt-pkg/debfile.h>

 #include <inttypes.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <inttypes.h>
 #include <sys/stat.h>
 #include <errno.h>

-    
+#include <string>
+

 #include "contents.h"
 #include "contents.h"

-    
+

 class CacheDB
 {
    protected:
 class CacheDB
 {
    protected:


@@ -34,7 +34,7 @@ class CacheDB
    DB *Dbp;
    bool DBLoaded;
    bool ReadOnly;
    DB *Dbp;
    bool DBLoaded;
    bool ReadOnly;

-   string DBFile;
+   std::string DBFile;

 
    // Generate a key for the DB of a given type
    inline void InitQuery(const char *Type)
 
    // Generate a key for the DB of a given type
    inline void InitQuery(const char *Type)


@@ -49,7 +49,7 @@ class CacheDB
    {
       return Dbp->get(Dbp,0,&Key,&Data,0) == 0;
    };
    {
       return Dbp->get(Dbp,0,&Key,&Data,0) == 0;
    };

-   inline bool Put(const void *In,unsigned long Length) 
+   inline bool Put(const void *In,unsigned long const &Length) 

    {
       if (ReadOnly == true)
         return true;
    {
       if (ReadOnly == true)
         return true;


@@ -63,30 +63,34 @@ class CacheDB
       return true;
    }
    bool OpenFile();
       return true;
    }
    bool OpenFile();

-   bool GetFileStat();
+   bool GetFileStat(bool const &doStat = false);

    bool GetCurStat();
    bool LoadControl();
    bool GetCurStat();
    bool LoadControl();

-   bool LoadContents(bool GenOnly);
-   bool GetMD5(bool GenOnly);
-   bool GetSHA1(bool GenOnly);
-   bool GetSHA256(bool GenOnly);
+   bool LoadContents(bool const &GenOnly);
+   bool GetMD5(bool const &GenOnly);
+   bool GetSHA1(bool const &GenOnly);
+   bool GetSHA256(bool const &GenOnly);
+   bool GetSHA512(bool const &GenOnly);

    
    // Stat info stored in the DB, Fixed types since it is written to disk.
    enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2),
    
    // Stat info stored in the DB, Fixed types since it is written to disk.
    enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2),

-       FlSize=(1<<3), FlSHA1=(1<<4), FlSHA256=(1<<5)};
+                  FlSize=(1<<3), FlSHA1=(1<<4), FlSHA256=(1<<5), 
+                  FlSHA512=(1<<6)};
+

    struct StatStore
    {
       uint32_t Flags;
       uint32_t mtime;          
    struct StatStore
    {
       uint32_t Flags;
       uint32_t mtime;          

-      uint32_t FileSize;
+      uint64_t FileSize;

       uint8_t  MD5[16];
       uint8_t  SHA1[20];
       uint8_t  SHA256[32];
       uint8_t  MD5[16];
       uint8_t  SHA1[20];
       uint8_t  SHA256[32];

+      uint8_t  SHA512[64];

    } CurStat;
    struct StatStore OldStat;
    
    // 'set' state
    } CurStat;
    struct StatStore OldStat;
    
    // 'set' state

-   string FileName;
+   std::string FileName;

    FileFd *Fd;
    debDebFile *DebFile;
    
    FileFd *Fd;
    debDebFile *DebFile;
    


@@ -95,9 +99,10 @@ class CacheDB
    // Data collection helpers
    debDebFile::MemControlExtract Control;
    ContentsExtract Contents;
    // Data collection helpers
    debDebFile::MemControlExtract Control;
    ContentsExtract Contents;

-   string MD5Res;
-   string SHA1Res;
-   string SHA256Res;
+   std::string MD5Res;
+   std::string SHA1Res;
+   std::string SHA256Res;
+   std::string SHA512Res;

    
    // Runtime statistics
    struct Stats
    
    // Runtime statistics
    struct Stats


@@ -106,32 +111,40 @@ class CacheDB
       double MD5Bytes;
       double SHA1Bytes;
       double SHA256Bytes;
       double MD5Bytes;
       double SHA1Bytes;
       double SHA256Bytes;

+      double SHA512Bytes;

       unsigned long Packages;
       unsigned long Misses;  
       unsigned long Packages;
       unsigned long Misses;  

-      unsigned long DeLinkBytes;
+      unsigned long long DeLinkBytes;

       
       inline void Add(const Stats &S) {
       
       inline void Add(const Stats &S) {

-        Bytes += S.Bytes; MD5Bytes += S.MD5Bytes; SHA1Bytes += S.SHA1Bytes; 
+        Bytes += S.Bytes; 
+         MD5Bytes += S.MD5Bytes; 
+         SHA1Bytes += S.SHA1Bytes; 

         SHA256Bytes += S.SHA256Bytes;
         SHA256Bytes += S.SHA256Bytes;

-        Packages += S.Packages; Misses += S.Misses; DeLinkBytes += S.DeLinkBytes;};
-      Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0), Packages(0), Misses(0), DeLinkBytes(0) {};
+        SHA512Bytes += S.SHA512Bytes;
+        Packages += S.Packages;
+         Misses += S.Misses; 
+         DeLinkBytes += S.DeLinkBytes;
+      };
+      Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0),
+               SHA512Bytes(0),Packages(0), Misses(0), DeLinkBytes(0) {};

    } Stats;
    
    } Stats;
    

-   bool ReadyDB(string DB);
+   bool ReadyDB(std::string const &DB);

    inline bool DBFailed() {return Dbp != 0 && DBLoaded == false;};
    inline bool Loaded() {return DBLoaded == true;};
    
    inline bool DBFailed() {return Dbp != 0 && DBLoaded == false;};
    inline bool Loaded() {return DBLoaded == true;};
    

-   inline off_t GetFileSize(void) {return CurStat.FileSize;}
+   inline unsigned long long GetFileSize(void) {return CurStat.FileSize;}

    
    

-   bool SetFile(string FileName,struct stat St,FileFd *Fd);
-   bool GetFileInfo(string FileName, bool DoControl, bool DoContents,
-                  bool GenContentsOnly, bool DoMD5, bool DoSHA1, bool DoSHA256);
+   bool SetFile(std::string const &FileName,struct stat St,FileFd *Fd);
+   bool GetFileInfo(std::string const &FileName, bool const &DoControl, bool const &DoContents, bool const &GenContentsOnly,
+                   bool const &DoMD5, bool const &DoSHA1, bool const &DoSHA256, bool const &DoSHA512, bool const &checkMtime = false);

    bool Finish();   
    
    bool Clean();
    
    bool Finish();   
    
    bool Clean();
    

-   CacheDB(string DB) : Dbp(0), Fd(NULL), DebFile(0) {ReadyDB(DB);};
-   ~CacheDB() {ReadyDB(string()); delete DebFile;};
+   CacheDB(std::string const &DB) : Dbp(0), Fd(NULL), DebFile(0) {TmpKey[0]='\0'; ReadyDB(DB);};
+   ~CacheDB() {ReadyDB(std::string()); delete DebFile;};

 };
     
 #endif
 };
     
 #endif