* apt-pkg/indexrecords.cc:

  - do not create empty Entries as a sideeffect of Lookup()

diff --git a/apt-pkg/indexrecords.cc b/apt-pkg/indexrecords.cc
index cdb9250e821f9567d88bc3e5476f40629c06f072..af2639beb851cfb125bf84b072c9aab2109e4daf 100644 (file)
--- a/apt-pkg/indexrecords.cc
+++ b/apt-pkg/indexrecords.cc
@@ -44,7 +44,10 @@ time_t indexRecords::GetValidUntil() const
 
 const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
 {
 
 const indexRecords::checkSum *indexRecords::Lookup(const string MetaKey)
 {

-   return Entries[MetaKey];
+   std::map<std::string, indexRecords::checkSum* >::const_iterator sum = Entries.find(MetaKey);
+   if (sum == Entries.end())
+      return NULL;
+   return sum->second;

 }
 
 bool indexRecords::Exists(string const &MetaKey) const
 }
 
 bool indexRecords::Exists(string const &MetaKey) const

diff --git a/debian/changelog b/debian/changelog
index 6ef3c4a781fa8f499431a7bf160b82f1212afc15..7461e9a259f0b682ef68710e8c08164c5ade10cb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ apt (0.8.16~exp13) UNRELEASED; urgency=low
     - correctly ignore already (un)hold packages
   * apt-pkg/cachefile.cc:
     - clean up lost atomic cachefiles with 'clean' (Closes: #650513)
     - correctly ignore already (un)hold packages
   * apt-pkg/cachefile.cc:
     - clean up lost atomic cachefiles with 'clean' (Closes: #650513)

+  * apt-pkg/indexrecords.cc:
+    - do not create empty Entries as a sideeffect of Lookup()

 
   [ Steve Langasek ]
   * cmdline/apt-get.cc:
 
   [ Steve Langasek ]
   * cmdline/apt-get.cc:


@@ -47,7 +49,7 @@ apt (0.8.16~exp13) UNRELEASED; urgency=low
   * apt-pkg/contrib/fileutl.h:
     - fix compat with FileFd::OpenDescriptor() in ReadOnlyGzip mode
 
   * apt-pkg/contrib/fileutl.h:
     - fix compat with FileFd::OpenDescriptor() in ReadOnlyGzip mode
 

- -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 11 Feb 2012 22:34:29 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 18 Feb 2012 18:22:14 +0100

 
 apt (0.8.16~exp12) experimental; urgency=low
 
 
 apt (0.8.16~exp12) experimental; urgency=low