Просмотр исходного кода

* cmdline/apt-get.cc, apt-pkg/cdrom.cc:
- fix memory leaks in error conditions in DoSource()

Michael Vogt лет назад: 16
Родитель
Сommit
7a511e5d95
3 измененных файлов с 9 добавлено и 2 удалено
  1. 2 1
      apt-pkg/cdrom.cc
  2. 5 1
      cmdline/apt-get.cc
  3. 2 0
      debian/changelog

+ 2 - 1
apt-pkg/cdrom.cc

@@ -289,7 +289,8 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name)
 	 List[J] = string();
       }
    }  
- 
+   delete[] Inodes;
+
    // Wipe erased entries
    for (unsigned int I = 0; I < List.size();)
    {

+ 5 - 1
cmdline/apt-get.cc

@@ -2315,6 +2315,7 @@ bool DoSource(CommandLine &CmdL)
    {
       for (unsigned I = 0; I != J; I++)
 	 ioprintf(cout,_("Fetch source %s\n"),Dsc[I].Package.c_str());
+      delete[] Dsc;
       return true;
    }
    
@@ -2325,6 +2326,7 @@ bool DoSource(CommandLine &CmdL)
       for (; I != Fetcher.UriEnd(); I++)
 	 cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << 
 	       I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl;
+      delete[] Dsc;
       return true;
    }
    
@@ -2350,6 +2352,7 @@ bool DoSource(CommandLine &CmdL)
    if (_config->FindB("APT::Get::Download-only",false) == true)
    {
       c1out << _("Download complete and in download only mode") << endl;
+      delete[] Dsc;
       return true;
    }
 
@@ -2411,7 +2414,8 @@ bool DoSource(CommandLine &CmdL)
       
       _exit(0);
    }
-   
+   delete[] Dsc;
+
    // Wait for the subprocess
    int Status = 0;
    while (waitpid(Process,&Status,0) != Process)

+ 2 - 0
debian/changelog

@@ -4,6 +4,8 @@ apt (0.7.25.3ubuntu4) UNRELEASED; urgency=low
   * apt-pkg/deb/debversion.cc:
     - consider absent of debian revision equivalent to 0 (Closes: #573592)
       LP: #540228
+  * cmdline/apt-get.cc, apt-pkg/cdrom.cc:
+   - fix memory leaks in error conditions in DoSource()
   
  -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 26 Mar 2010 16:57:49 +0100