* apt-pkg/packagemanager.cc:

  - do not segfault if nothing can be configured to statisfy
    a pre-depends (e.g. in a pre-depends loop) (Closes: #681958)

diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc
index 46fc499..b93bf6a 100644 (file)
--- a/apt-pkg/packagemanager.cc
+++ b/apt-pkg/packagemanager.cc
@@ -643,7 +643,7 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg, bool const Immediate, int c
            }
 
            // Look for something that could be configured.
-           for (DepIterator Cur = Start; Bad == true; ++Cur)
+           for (DepIterator Cur = Start; Bad == true && Cur.end() == false; ++Cur)
            {
               SPtrArray<Version *> VList = Cur.AllTargets();
               for (Version **I = VList; *I != 0; ++I)

diff --git a/debian/changelog b/debian/changelog
index c33b9d4..d3f599e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ apt (0.9.7.3) UNRELEASED; urgency=low
   * apt-pkg/cacheset.cc:
     - handle :all and :native correctly as architectures again
       in the commandline parsing (regression in 0.9.7)
+  * apt-pkg/packagemanager.cc:
+    - do not segfault if nothing can be configured to statisfy
+      a pre-depends (e.g. in a pre-depends loop) (Closes: #681958)
 
  -- David Kalnischkies <kalnischkies@gmail.com>  Wed, 18 Jul 2012 11:45:57 +0200