diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2012-07-18 13:48:46 +0200 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2012-07-18 13:48:46 +0200 |
| commit | 275024e9ae6c827ebb664bd1c0c3264bcff343c0 (patch) | |
| tree | 63c33ef0ff3c5e9c3f1929fb068f9568798f76e5 | |
| parent | 7089f4563376553e40af1cd0c71ea8813e707a25 (diff) | |
* 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)
| -rw-r--r-- | apt-pkg/packagemanager.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/apt-pkg/packagemanager.cc b/apt-pkg/packagemanager.cc index 46fc499c6..b93bf6ab9 100644 --- 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 c33b9d4b2..d3f599e7f 100644 --- 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 |