Merge remote-tracking branch 'upstream/debian/sid' into bugfix/coverity

diff --git a/apt-pkg/cdrom.h b/apt-pkg/cdrom.h
index 4fc3d39285b727b58518d6a539a12e086d1ebe40..7d19eb81359a5205a4a04b8e4408576cc356804c 100644 (file)
--- a/apt-pkg/cdrom.h
+++ b/apt-pkg/cdrom.h
@@ -18,7 +18,7 @@ class pkgCdromStatus                                                  /*{{{*/
    int totalSteps;
 
  public:
-   pkgCdromStatus() {};
+   pkgCdromStatus() : totalSteps(0) {};
    virtual ~pkgCdromStatus() {};
 
    // total steps

diff --git a/apt-pkg/contrib/sha2.h b/apt-pkg/contrib/sha2.h
index 51c921dbd7af7344560a9a52b3573d2d845ccb1a..8e0c99a1b6631d1e3ff74d5207f8a08f3a8dee91 100644 (file)
--- a/apt-pkg/contrib/sha2.h
+++ b/apt-pkg/contrib/sha2.h
@@ -60,10 +60,11 @@ class SHA256Summation : public SHA2SummationBase
       res.Set(Sum);
       return res;
    };
-   SHA256Summation() 
+   SHA256Summation()
    {
       SHA256_Init(&ctx);
       Done = false;
+      memset(&Sum, 0, sizeof(Sum));
    };
 };
 
@@ -96,6 +97,7 @@ class SHA512Summation : public SHA2SummationBase
    {
       SHA512_Init(&ctx);
       Done = false;
+      memset(&Sum, 0, sizeof(Sum));
    };
 };
 

diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h
index 4718f5101171bf68f5e63e11830e0fb8e77b1f44..126f4219de805bba3c40243146df55b0e4c13c57 100644 (file)
--- a/apt-pkg/tagfile.h
+++ b/apt-pkg/tagfile.h
@@ -84,7 +84,7 @@ class pkgTagSection
       Stop = this->Stop;
    };
    
-   pkgTagSection() : Section(0), TagCount(0), Stop(0) {};
+   pkgTagSection() : Section(0), TagCount(0), Stop(0), d(NULL) {};
    virtual ~pkgTagSection() {};
 };