summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-11-21 14:33:21 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-11-21 14:33:21 +0000
commitdc1f50b9ddb8f7643285d761eeb2e53f8f041adc (patch)
treed42f9acaa7d4077140be6df18c1a9591a2f7003e
parentf2047f6b2aa62632b670343d4275be4d69f4b5e3 (diff)
* merge fix for #339533
-rw-r--r--apt-pkg/cacheiterators.h2
-rw-r--r--debian/changelog2
2 files changed, 3 insertions, 1 deletions
diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index c3a0d0a5a..2b326bd65 100644
--- a/apt-pkg/cacheiterators.h
+++ b/apt-pkg/cacheiterators.h
@@ -107,7 +107,7 @@ class pkgCache::VerIterator
// Iteration
void operator ++(int) {if (Ver != Owner->VerP) Ver = Owner->VerP + Ver->NextVer;};
inline void operator ++() {operator ++(0);};
- inline bool end() const {return Ver == Owner->VerP?true:false;};
+ inline bool end() const {return Owner == NULL || (Ver == Owner->VerP?true:false);};
inline void operator =(const VerIterator &B) {Ver = B.Ver; Owner = B.Owner;};
// Comparison
diff --git a/debian/changelog b/debian/changelog
index 9115faabc..7399b695e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ apt (0.6.42.4) unstable; urgency=low
* added support for "/etc/apt/sources.list.d" directory
(closes: #66325)
* make pkgDirStream (a bit) more complete
+ * fix bug in pkgCache::VerIterator::end() (thanks to Daniel Burrows)
+ (closes: #339533)
--