浏览代码

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

David Kalnischkies 14 年之前
父节点
当前提交
d90d3a05de
共有 2 个文件被更改,包括 7 次插入2 次删除
  1. 4 1
      apt-pkg/indexrecords.cc
  2. 3 1
      debian/changelog

+ 4 - 1
apt-pkg/indexrecords.cc

@@ -44,7 +44,10 @@ time_t indexRecords::GetValidUntil() const
 
 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

+ 3 - 1
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)
+  * apt-pkg/indexrecords.cc:
+    - do not create empty Entries as a sideeffect of Lookup()
 
   [ 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
 
- -- 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