fix a few esoteric cppcheck errors/warnings/infos

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index c32c732126a172f6e0aa13bb79d7ecf9d29c763f..a370f15a3868a04e4018948e1d39dd498b36b0b2 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -529,7 +529,6 @@ bool pkgPackageManager::SmartRemove(PkgIterator Pkg)
    List->Flag(Pkg,pkgOrderList::Configured,pkgOrderList::States);
 
    return Remove(Pkg,(Cache[Pkg].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge);
-   return true;
 }
                                                                        /*}}}*/
 // PM::SmartUnPack - Install helper                                    /*{{{*/

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 85ae1cd7ecc8b308335e7d6ef4695783a0c30379..2d0554e21c3f077be5b81f657bcbe49d342b5a6b 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1730,7 +1730,7 @@ bool DoAutomaticRemove(CacheFile &Cache)
              Pkg != tooMuch.end() && Changed == false; ++Pkg)
         {
            APT::PackageSet too;
-           too.insert(Pkg);
+           too.insert(*Pkg);
            for (pkgCache::PrvIterator Prv = Cache[Pkg].CandidateVerIter(Cache).ProvidesList();
                 Prv.end() == false; ++Prv)
               too.insert(Prv.ParentPkg());

diff --git a/methods/gpgv.cc b/methods/gpgv.cc
index 2b2aba017c45e6df20968700b45f2d4172c21491..25ba0d06350e433701b85add7c392201c36b65c7 100644 (file)
--- a/methods/gpgv.cc
+++ b/methods/gpgv.cc
@@ -98,8 +98,16 @@ string GPGVMethod::VerifyGetSigners(const char *file, const char *outfile,
       // Read a line.  Sigh.
       while ((c = getc(pipein)) != EOF && c != '\n')
       {
-         if (bufferoff == buffersize)
-            buffer = (char *) realloc(buffer, buffersize *= 2);
+        if (bufferoff == buffersize)
+        {
+           char* newBuffer = (char *) realloc(buffer, buffersize *= 2);
+           if (newBuffer == NULL)
+           {
+              free(buffer);
+              return "Couldn't allocate a buffer big enough for reading";
+           }
+           buffer = newBuffer;
+        }
          *(buffer+bufferoff) = c;
          bufferoff++;
       }

diff --git a/methods/rred.cc b/methods/rred.cc
index e37a12ed952ee6dd1427d0d4c3c3e0ac70324b88..1e352d0e7850c235ef30532ec66aea20a7f7cac5 100644 (file)
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -333,7 +333,12 @@ RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From,               /*{{{*/
                }
                if(command_count == command_alloc) {
                        command_alloc = (command_alloc + 64) * 3 / 2;
-                       commands = (EdCommand*) realloc(commands, command_alloc * sizeof(EdCommand));
+                       EdCommand* newCommands = (EdCommand*) realloc(commands, command_alloc * sizeof(EdCommand));
+                       if (newCommands == NULL) {
+                               free(commands);
+                               return MMAP_FAILED;
+                       }
+                       commands = newCommands;
                }
                commands[command_count++] = cmd;
        }