* be extra carefull in cmdline/apt-get.cc:FindSrc() and check VF.File() for NULL

diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 3475d79aed757f9f1dfd71e5ff344c982c22e46d..040f670b1f051aff0953fec6fb3be40571fafc4c 100644 (file)
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -1200,7 +1200,7 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
       VerTag = string(TmpSrc.begin() + Slash + 1,TmpSrc.end());
       TmpSrc = string(TmpSrc.begin(),TmpSrc.begin() + Slash);
    } 
       VerTag = string(TmpSrc.begin() + Slash + 1,TmpSrc.end());
       TmpSrc = string(TmpSrc.begin(),TmpSrc.begin() + Slash);
    } 

-   else  if(DefRel.empty() == false) 
+   else  if(DefRel.empty() == false)

    {
       // we have a default release, try to locate the pkg. we do it like
       // this because GetCandidateVer() will not "downgrade", that means
    {
       // we have a default release, try to locate the pkg. we do it like
       // this because GetCandidateVer() will not "downgrade", that means


@@ -1211,6 +1211,10 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
         for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false;
              VF++)
         {
         for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false;
              VF++)
         {

+           // extra paranioa
+           if(VF.File() == NULL)
+              continue;
+

            /* If this is the status file, and the current version is not the
               version in the status file (ie it is not installed, or somesuch)
               then it is not a candidate for installation, ever. This weeds
            /* If this is the status file, and the current version is not the
               version in the status file (ie it is not installed, or somesuch)
               then it is not a candidate for installation, ever. This weeds

diff --git a/debian/changelog b/debian/changelog
index 932ac592f6e85138f2914b79131ef2ad36ef133a..9716c3836d31aa4c70bbb42be2240d15f10d908b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ apt (0.6.42.1) unstable; urgency=low
   * apt-pkg/pkgrecords.cc:
     - revert patch from last version, it causes trouble on alpha 
       and ia64 (closes: #335102, #335103)
   * apt-pkg/pkgrecords.cc:
     - revert patch from last version, it causes trouble on alpha 
       and ia64 (closes: #335102, #335103)

+  * cmdline/apt-get.cc:
+    - be extra carefull in FindSrc (closes: #335213)

 
  -- Michael Vogt <mvo@debian.org>  Sat, 22 Oct 2005 23:44:35 +0200
 
 
  -- Michael Vogt <mvo@debian.org>  Sat, 22 Oct 2005 23:44:35 +0200