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

* 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 лет назад: 14
Родитель
Сommit
275024e9ae
2 измененных файлов с 4 добавлено и 1 удалено
  1. 1 1
      apt-pkg/packagemanager.cc
  2. 3 0
      debian/changelog

+ 1 - 1
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)

+ 3 - 0
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