* apt-pkg/contrib/configuration.cc:

  - fix double delete (LP: #848907)
  - ignore only the invalid regexp instead of all options
* apt-pkg/acquire-item.h, apt-pkg/deb/debmetaindex.cc:
  - fix fetching language information by adding OptionalSubIndexTarget
* methods/https.cc:
  - cleanup broken downloads properly

* ftparchive/cachedb.cc:
  - fix buffersize in bytes2hex
* apt-pkg/deb/deblistparser.cc:
  - fix crash when the dynamic mmap needs to be grown in
    LoadReleaseInfo (LP: #854090)

1 files changed, 9 insertions, 5 deletions

diff --git a/ftparchive/cachedb.cc b/ftparchive/cachedb.cc
index a1d70f912..6eccb8d4a 100644
--- a/ftparchive/cachedb.cc
+++ b/ftparchive/cachedb.cc
@@ -299,11 +299,15 @@ bool CacheDB::LoadContents(bool const &GenOnly)
 									/*}}}*/
 
 static string bytes2hex(uint8_t *bytes, size_t length) {
-   char space[65];
-   if (length * 2 > sizeof(space) - 1) length = (sizeof(space) - 1) / 2;
-   for (size_t i = 0; i < length; i++)
-      snprintf(&space[i*2], 3, "%02x", bytes[i]);
-   return string(space);
+   char buf[3];
+   string space;
+
+   space.reserve(length*2 + 1);
+   for (size_t i = 0; i < length; i++) {
+      snprintf(buf, sizeof(buf), "%02x", bytes[i]);
+      space.append(buf);
+   }
+   return space;
 }
 
 static inline unsigned char xdig2num(char const &dig) {