* cmdline/apt-get.cc

  - fix memory leaks in error conditions in DoSource()

diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc
index 96d4e9c91c2f95ef56a3a851e68a9dd7a1e51347..783ffc43069338c169a79654599378222409c970 100644 (file)
--- a/apt-pkg/cdrom.cc
+++ b/apt-pkg/cdrom.cc
@@ -289,7 +289,8 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
         List[J] = string();
       }
    }  
         List[J] = string();
       }
    }  

- 
+   delete[] Inodes;
+

    // Wipe erased entries
    for (unsigned int I = 0; I < List.size();)
    {
    // Wipe erased entries
    for (unsigned int I = 0; I < List.size();)
    {

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index b35e16b9274c8a51d904f8627f27bec6712afb41..849401b0c59a91d97bb804d46d561f897b6cb543 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2299,6 +2299,7 @@ bool DoSource(CommandLine &CmdL)
    {
       for (unsigned I = 0; I != J; I++)
         ioprintf(cout,_("Fetch source %s\n"),Dsc[I].Package.c_str());
    {
       for (unsigned I = 0; I != J; I++)
         ioprintf(cout,_("Fetch source %s\n"),Dsc[I].Package.c_str());

+      delete[] Dsc;

       return true;
    }
    
       return true;
    }
    


@@ -2309,6 +2310,7 @@ bool DoSource(CommandLine &CmdL)
       for (; I != Fetcher.UriEnd(); I++)
         cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << 
               I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl;
       for (; I != Fetcher.UriEnd(); I++)
         cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << 
               I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl;

+      delete[] Dsc;

       return true;
    }
    
       return true;
    }
    


@@ -2334,6 +2336,7 @@ bool DoSource(CommandLine &CmdL)
    if (_config->FindB("APT::Get::Download-only",false) == true)
    {
       c1out << _("Download complete and in download only mode") << endl;
    if (_config->FindB("APT::Get::Download-only",false) == true)
    {
       c1out << _("Download complete and in download only mode") << endl;

+      delete[] Dsc;

       return true;
    }
 
       return true;
    }
 


@@ -2395,7 +2398,8 @@ bool DoSource(CommandLine &CmdL)
       
       _exit(0);
    }
       
       _exit(0);
    }

-   
+   delete[] Dsc;
+

    // Wait for the subprocess
    int Status = 0;
    while (waitpid(Process,&Status,0) != Process)
    // Wait for the subprocess
    int Status = 0;
    while (waitpid(Process,&Status,0) != Process)

diff --git a/debian/changelog b/debian/changelog
index f27c096b60ec066e1ee960c8ca5a16e76dedc4fe..b05498f12e37924ce32cc8644bdf05f916ab6d22 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ apt (0.7.26) UNRELEASED; urgency=low
     - fix error message construction in OpenLog()
   * cmdline/apt-get.cc:
     - add a --only-upgrade flag to install command (Closes: #572259)
     - fix error message construction in OpenLog()
   * cmdline/apt-get.cc:
     - add a --only-upgrade flag to install command (Closes: #572259)

+    - fix memory leaks in error conditions in DoSource()

 
  -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 19 Feb 2010 21:21:43 +0100
 
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 19 Feb 2010 21:21:43 +0100