* merge fix for #339533

diff --git a/apt-pkg/cacheiterators.h b/apt-pkg/cacheiterators.h
index c3a0d0a5a45fa3132a30ea57118e26d0b9737069..2b326bd65884d995133b2158f04848061ab839c0 100644 (file)
--- 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 9115faabcac5dfb1e0d3b376dc2adb479715c531..7399b695e7ff602a53c4cbf7cb08c42c172dcd51 100644 (file)
--- 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)
   
  --